From 966f7a858cc71f2b922063c2316e7c8e6c4a31c8 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 13 Dec 2022 18:49:14 +0000 Subject: [PATCH 1/2] Rebase to jammy --- .github/workflows/call_invalid_helper.yml | 12 ++++++++++++ Dockerfile | 5 ++++- README.md | 1 + readme-vars.yml | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/call_invalid_helper.yml 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 384279c..36961cd 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 @@ -33,4 +35,5 @@ COPY /root / # ports and volumes EXPOSE 3000 + VOLUME /config diff --git a/README.md b/README.md index 2bf4a03..6447fbe 100644 --- a/README.md +++ b/README.md @@ -227,5 +227,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.12.22:** - Rebase to Jammy. * **14.09.21:** - Use the official appimage, switch to single arch (x86_64). Armhf and aarch64 users can remain on version 3.0.2 but there won't be further updates. * **07.04.21:** - Initial release. diff --git a/readme-vars.yml b/readme-vars.yml index eb72c0d..98a94e2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -41,5 +41,6 @@ app_setup_block: | # changelog changelogs: + - { date: "13.12.22:", desc: "Rebase to Jammy." } - { date: "14.09.21:", desc: "Use the official appimage, switch to single arch (x86_64). Armhf and aarch64 users can remain on version 3.0.2 but there won't be further updates." } - { date: "07.04.21:", desc: "Initial release." } From d23e214fd9e74cd87fceb546ffd9b7d229a94c1b Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 16 Dec 2022 14:57:19 +0000 Subject: [PATCH 2/2] Grab correct artefacts --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 36961cd..1e761ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN \ mkdir -p /app/audacity/ && \ curl -o \ /app/audacity/audacity -L \ - "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-linux-${AUDACITY_VERSION}-x86_64.AppImage" && \ + "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-linux-${AUDACITY_VERSION}-x64.AppImage" && \ chmod +x /app/audacity/audacity && \ echo "**** cleanup ****" && \ rm -rf \