From 22baeb44592ffdd5efa8bb7b013df27c539bd472 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 13 Dec 2022 18:56:17 +0000 Subject: [PATCH] Rebase to jammy, migrate to s6v3 --- .github/workflows/call_invalid_helper.yml | 12 ++++++++++++ Dockerfile | 5 ++++- Dockerfile.aarch64 | 5 ++++- Dockerfile.armhf | 5 ++++- README.md | 1 + readme-vars.yml | 1 + .../init-config-end/dependencies.d/init-openboxcopy | 0 .../init-openboxcopy/dependencies.d/init-config | 0 .../s6-rc.d/init-openboxcopy/run} | 3 ++- root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type | 1 + root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up | 1 + .../s6-rc.d/user/contents.d/init-openboxcopy | 0 12 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy create mode 100644 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-config rename root/etc/{cont-init.d/56-openboxcopy => s6-overlay/s6-rc.d/init-openboxcopy/run} (78%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 0000000..773767c --- /dev/null +++ b/.github/workflows/call_invalid_helper.yml @@ -0,0 +1,12 @@ +name: Comment on invalid interaction +on: + issues: + types: + - labeled +jobs: + add-comment-on-invalid: + if: github.event.label.name == 'invalid' + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 + secrets: inherit diff --git a/Dockerfile b/Dockerfile index 6408276..7eae322 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:focal +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-rdesktop-web:jammy # set version label ARG BUILD_DATE @@ -47,4 +49,5 @@ COPY /root / # ports and volumes EXPOSE 3000 + VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 92e9c32..e27fe6b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-focal +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-jammy # set version label ARG BUILD_DATE @@ -26,4 +28,5 @@ COPY /root / # ports and volumes EXPOSE 3000 + VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 4753405..18750d8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-focal +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-jammy # set version label ARG BUILD_DATE @@ -26,4 +28,5 @@ COPY /root / # ports and volumes EXPOSE 3000 + VOLUME /config diff --git a/README.md b/README.md index 17a2405..5e4d750 100644 --- a/README.md +++ b/README.md @@ -285,5 +285,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.12.22:** - Rebase to Jammy, migrate to s6v3. * **06.05.22:** - Use the full semver version in image tags. Arm32/64 version tags are inaccurate due to installing from ubuntu repo, which is usually behind. * **12.03.22:** - Initial Release. diff --git a/readme-vars.yml b/readme-vars.yml index 0ae54ac..12eee1f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -97,5 +97,6 @@ app_setup_block: | # changelog changelogs: + - { date: "13.12.22:", desc: "Rebase to Jammy, migrate to s6v3." } - { date: "06.05.22:", desc: "Use the full semver version in image tags. Arm32/64 version tags are inaccurate due to installing from ubuntu repo, which is usually behind." } - { date: "12.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-config b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-config 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 78% rename from root/etc/cont-init.d/56-openboxcopy rename to root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run index f22df65..e7504d5 --- a/root/etc/cont-init.d/56-openboxcopy +++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run @@ -1,7 +1,8 @@ #!/usr/bin/with-contenv bash # default file copies first run -[[ ! -f /config/.config/openbox/menu.xml ]] && \ +if [[ ! -f /config/.config/openbox/menu.xml ]]; then mkdir -p /config/.config/openbox && \ cp /defaults/menu.xml /config/.config/openbox/menu.xml && \ chown -R abc:abc /config/.config +fi 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