diff --git a/Dockerfile b/Dockerfile index e4597c4..a8f499d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:jammy-f5e8ed1d-ls35 +FROM ghcr.io/linuxserver/baseimage-rdesktop-web:jammy # set version label ARG BUILD_DATE @@ -10,6 +10,8 @@ LABEL maintainer="thelamer" # app title ENV TITLE=Kdenlive +ARG DEBIAN_FRONTEND="noninteractive" + RUN \ echo "**** install packages ****" && \ apt-get update && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index db5ec9d..3cc787e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-jammy-f5e8ed1d-ls35 +FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-jammy # set version label ARG BUILD_DATE @@ -10,6 +10,8 @@ LABEL maintainer="thelamer" # app title ENV TITLE=Kdenlive +ARG DEBIAN_FRONTEND="noninteractive" + RUN \ echo "**** install packages ****" && \ apt-get update && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 226cd39..d80fce6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-jammy-f5e8ed1d-ls35 +FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-jammy # set version label ARG BUILD_DATE @@ -10,6 +10,8 @@ LABEL maintainer="thelamer" # app title ENV TITLE=Kdenlive +ARG DEBIAN_FRONTEND="noninteractive" + RUN \ echo "**** install packages ****" && \ apt-get update && \ diff --git a/README.md b/README.md index 251fe81..e54f7ff 100644 --- a/README.md +++ b/README.md @@ -286,5 +286,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **16.09.22:** - Migrate to s6v3. * **09.03.22:** - Update seccomp explanation. * **07.03.22:** - Initial release. diff --git a/readme-vars.yml b/readme-vars.yml index c0484db..57a4a73 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -97,5 +97,6 @@ app_setup_block: | # changelog changelogs: + - { date: "16.09.22:", desc: "Migrate to s6v3." } - { date: "09.03.22:", desc: "Update seccomp explanation." } - { date: "07.03.22:", desc: "Initial release." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-rdesktop-web-end b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-rdesktop-web-end new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/56-openboxcopy b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/56-openboxcopy rename to root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up new file mode 100644 index 0000000..c5a506f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-openboxcopy/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy new file mode 100644 index 0000000..e69de29