From fee8910390e3f9ade539152ab969a073add60bda Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 6 Aug 2024 19:45:00 -0400 Subject: [PATCH] add debian-mate --- .github/CONTRIBUTING.md | 4 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/external_trigger.yml | 4 +- .github/workflows/greetings.yml | 2 +- .github/workflows/package_trigger.yml | 18 ++-- Dockerfile | 28 +++--- Dockerfile.aarch64 | 28 +++--- Jenkinsfile | 104 ++++++++++----------- README.md | 2 +- jenkins-vars.yml | 4 +- root/etc/apt/preferences.d/firefox-no-snap | 3 - root/usr/bin/exo-open | 7 ++ root/usr/local/bin/wrapped-chromium | 15 +++ 13 files changed, 114 insertions(+), 107 deletions(-) delete mode 100644 root/etc/apt/preferences.d/firefox-no-snap create mode 100755 root/usr/bin/exo-open create mode 100755 root/usr/local/bin/wrapped-chromium diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a352f365..4581e484 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -24,7 +24,7 @@ ## Readme If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit. -Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-rdesktop/edit/ubuntu-mate/readme-vars.yml). +Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-rdesktop/edit/debian-mate/readme-vars.yml). These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play. Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io) @@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Update the changelog -If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-mate/root), add an entry to the changelog +If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-rdesktop/tree/debian-mate/root), add an entry to the changelog ```yml changelogs: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b14009e3..00a512e8 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -21,7 +21,7 @@ ------------------------------ - - [ ] I have read the [contributing](https://github.com/linuxserver/docker-rdesktop/blob/ubuntu-mate/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications + - [ ] I have read the [contributing](https://github.com/linuxserver/docker-rdesktop/blob/debian-mate/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications ------------------------------ diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 2d3d964a..445559e4 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -4,13 +4,13 @@ on: workflow_dispatch: jobs: - external-trigger-ubuntu-mate: + external-trigger-debian-mate: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4.1.1 - name: External Trigger - if: github.ref == 'refs/heads/ubuntu-mate' + if: github.ref == 'refs/heads/debian-mate' run: | echo "**** No external release, exiting ****" echo "No external release, exiting" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index e21166d8..92306dca 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -9,5 +9,5 @@ jobs: - uses: actions/first-interaction@v1 with: issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.' - pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-rdesktop/blob/ubuntu-mate/.github/PULL_REQUEST_TEMPLATE.md)!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-rdesktop/blob/debian-mate/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index f6caa1e5..3ef7aa5c 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -4,28 +4,28 @@ on: workflow_dispatch: jobs: - package-trigger-ubuntu-mate: + package-trigger-debian-mate: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4.1.1 - name: Package Trigger - if: github.ref == 'refs/heads/ubuntu-mate' + if: github.ref == 'refs/heads/debian-mate' run: | - if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_RDESKTOP_UBUNTU_MATE }}" ]; then - echo "**** Github secret PAUSE_PACKAGE_TRIGGER_RDESKTOP_UBUNTU_MATE is set; skipping trigger. ****" - echo "Github secret \`PAUSE_PACKAGE_TRIGGER_RDESKTOP_UBUNTU_MATE\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_RDESKTOP_DEBIAN_MATE }}" ]; then + echo "**** Github secret PAUSE_PACKAGE_TRIGGER_RDESKTOP_DEBIAN_MATE is set; skipping trigger. ****" + echo "Github secret \`PAUSE_PACKAGE_TRIGGER_RDESKTOP_DEBIAN_MATE\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi - if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/ubuntu-mate/lastBuild/api/json | jq -r '.building') == "true" ]; then + if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/debian-mate/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY exit 0 fi - echo "**** Package trigger running off of ubuntu-mate branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_RDESKTOP_UBUNTU_MATE\". ****" - echo "Package trigger running off of ubuntu-mate branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_RDESKTOP_UBUNTU_MATE\`" >> $GITHUB_STEP_SUMMARY + echo "**** Package trigger running off of debian-mate branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_RDESKTOP_DEBIAN_MATE\". ****" + echo "Package trigger running off of debian-mate branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_RDESKTOP_DEBIAN_MATE\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/ubuntu-mate/buildWithParameters?PACKAGE_CHECK=true \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/debian-mate/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") echo "**** Jenkins job queue url: ${response%$'\r'} ****" echo "**** Sleeping 10 seconds until job starts ****" diff --git a/Dockerfile b/Dockerfile index 7eaf5af4..75de79d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:ubuntunoble +FROM ghcr.io/linuxserver/baseimage-rdesktop:debianbookworm # set version label ARG BUILD_DATE @@ -6,25 +6,20 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" -# prevent Ubuntu's firefox stub from being installed -COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap - RUN \ echo "**** install packages ****" && \ - add-apt-repository -y ppa:mozillateam/ppa && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ - apt-get install --no-install-recommends -y \ - ayatana-indicator-application \ - firefox \ - mate-applets \ - mate-applet-brisk-menu \ - mate-terminal \ - pluma \ - ubuntu-mate-artwork \ - ubuntu-mate-default-settings \ - ubuntu-mate-desktop \ - ubuntu-mate-icon-themes && \ + apt-get install -y --no-install-recommends \ + chromium \ + chromium-l10n \ + eom \ + mate-desktop-environment-core \ + pluma && \ + echo "**** application tweaks ****" && \ + sed -i \ + 's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \ + /usr/share/applications/chromium.desktop && \ echo "**** mate tweaks ****" && \ rm -f \ /etc/xdg/autostart/mate-power-manager.desktop \ @@ -33,7 +28,6 @@ RUN \ apt-get autoclean && \ rm -rf \ /config/.cache \ - /config/.launchpadlib \ /var/lib/apt/lists/* \ /var/tmp/* \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c8c882e8..53690e65 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-ubuntunoble +FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-debianbookworm # set version label ARG BUILD_DATE @@ -6,25 +6,20 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" -# prevent Ubuntu's firefox stub from being installed -COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap - RUN \ echo "**** install packages ****" && \ - add-apt-repository -y ppa:mozillateam/ppa && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ - apt-get install --no-install-recommends -y \ - ayatana-indicator-application \ - firefox \ - mate-applets \ - mate-applet-brisk-menu \ - mate-terminal \ - pluma \ - ubuntu-mate-artwork \ - ubuntu-mate-default-settings \ - ubuntu-mate-desktop \ - ubuntu-mate-icon-themes && \ + apt-get install -y --no-install-recommends \ + chromium \ + chromium-l10n \ + eom \ + mate-desktop-environment-core \ + pluma && \ + echo "**** application tweaks ****" && \ + sed -i \ + 's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \ + /usr/share/applications/chromium.desktop && \ echo "**** mate tweaks ****" && \ rm -f \ /etc/xdg/autostart/mate-power-manager.desktop \ @@ -33,7 +28,6 @@ RUN \ apt-get autoclean && \ rm -rf \ /config/.cache \ - /config/.launchpadlib \ /var/lib/apt/lists/* \ /var/tmp/* \ /tmp/* diff --git a/Jenkinsfile b/Jenkinsfile index 6e6123af..cad58ebc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:ubuntu-mate 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:debian-mate 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -77,7 +77,7 @@ pipeline { script{ env.LS_TAG_NUMBER = sh( script: '''#! /bin/bash - tagsha=$(git rev-list -n 1 ubuntu-mate-${LS_RELEASE} 2>/dev/null) + tagsha=$(git rev-list -n 1 debian-mate-${LS_RELEASE} 2>/dev/null) if [ "${tagsha}" == "${COMMIT_SHA}" ]; then echo ${LS_RELEASE_NUMBER} elif [ -z "${GIT_COMMIT}" ]; then @@ -153,10 +153,10 @@ pipeline { } } } - // If this is a ubuntu-mate build use live docker endpoints + // If this is a debian-mate build use live docker endpoints stage("Set ENV live build"){ when { - branch "ubuntu-mate" + branch "debian-mate" environment name: 'CHANGE_ID', value: '' } steps { @@ -166,20 +166,20 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'amd64-debian-mate-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-debian-mate-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { - env.CI_TAGS = 'ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'debian-mate-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - env.META_TAG = 'ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - env.EXT_RELEASE_TAG = 'ubuntu-mate-version-' + env.EXT_RELEASE_CLEAN + env.META_TAG = 'debian-mate-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.EXT_RELEASE_TAG = 'debian-mate-version-' + env.EXT_RELEASE_CLEAN } } } // If this is a dev build use dev docker endpoints stage("Set ENV dev build"){ when { - not {branch "ubuntu-mate"} + not {branch "debian-mate"} environment name: 'CHANGE_ID', value: '' } steps { @@ -189,13 +189,13 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'amd64-debian-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-debian-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { - env.CI_TAGS = 'ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'debian-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - env.META_TAG = 'ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - env.EXT_RELEASE_TAG = 'ubuntu-mate-version-' + env.EXT_RELEASE_CLEAN + env.META_TAG = 'debian-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.EXT_RELEASE_TAG = 'debian-mate-version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' } } @@ -212,13 +212,13 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-debian-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-debian-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { - env.CI_TAGS = 'ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'debian-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST - env.META_TAG = 'ubuntu-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST - env.EXT_RELEASE_TAG = 'ubuntu-mate-version-' + env.EXT_RELEASE_CLEAN + env.META_TAG = 'debian-mate-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.EXT_RELEASE_TAG = 'debian-mate-version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' } @@ -255,7 +255,7 @@ pipeline { // Use helper containers to render templated files stage('Update-Templates') { when { - branch "ubuntu-mate" + branch "debian-mate" environment name: 'CHANGE_ID', value: '' expression { env.CONTAINER_NAME != null @@ -267,24 +267,24 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest # Cloned repo paths for templating: - # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch ubuntu-mate of ${LS_USER}/${LS_REPO} for running the jenkins builder on - # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch ubuntu-mate of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github + # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch debian-mate of ${LS_USER}/${LS_REPO} for running the jenkins builder on + # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch debian-mate of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github - git clone --branch ubuntu-mate --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} + git clone --branch debian-mate --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest echo "Starting Stage 1 - Jenkinsfile update" if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f ubuntu-mate + git checkout -f debian-mate cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ git add Jenkinsfile git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git ubuntu-mate - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git ubuntu-mate + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git debian-mate + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git debian-mate echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} @@ -303,13 +303,13 @@ pipeline { mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f ubuntu-mate + git checkout -f debian-mate for i in ${TEMPLATES_TO_DELETE}; do git rm "${i}" done git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git ubuntu-mate - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git ubuntu-mate + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git debian-mate + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git debian-mate echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} @@ -325,7 +325,7 @@ pipeline { mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f ubuntu-mate + git checkout -f debian-mate cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE @@ -338,8 +338,8 @@ pipeline { fi git add readme-vars.yml ${TEMPLATED_FILES} git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git ubuntu-mate - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git ubuntu-mate + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git debian-mate + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git debian-mate echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} echo "Updating templates and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} @@ -406,7 +406,7 @@ pipeline { // Exit the build if the Templated files were just updated stage('Template-exit') { when { - branch "ubuntu-mate" + branch "debian-mate" environment name: 'CHANGE_ID', value: '' environment name: 'FILES_UPDATED', value: 'true' expression { @@ -419,10 +419,10 @@ pipeline { } } } - // If this is a ubuntu-mate build check the S6 service file perms + // If this is a debian-mate build check the S6 service file perms stage("Check S6 Service file Permissions"){ when { - branch "ubuntu-mate" + branch "debian-mate" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } @@ -569,7 +569,7 @@ pipeline { // Take the image we just built and dump package versions for comparison stage('Update-packages') { when { - branch "ubuntu-mate" + branch "debian-mate" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } @@ -592,14 +592,14 @@ pipeline { echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} - git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f ubuntu-mate + git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f debian-mate cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ cd ${TEMPDIR}/${LS_REPO}/ wait git add package_versions.txt git commit -m 'Bot Updating Package Versions' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git ubuntu-mate - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git ubuntu-mate + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git debian-mate + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git debian-mate echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} echo "Package tag updated, stopping build process" else @@ -617,7 +617,7 @@ pipeline { // Exit the build if the package file was just updated stage('PACKAGE-exit') { when { - branch "ubuntu-mate" + branch "debian-mate" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'true' environment name: 'EXIT_STATUS', value: '' @@ -631,7 +631,7 @@ pipeline { // Exit the build if this is just a package check and there are no changes to push stage('PACKAGECHECK-exit') { when { - branch "ubuntu-mate" + branch "debian-mate" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'false' environment name: 'EXIT_STATUS', value: '' @@ -718,12 +718,12 @@ pipeline { echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:ubuntu-mate + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:debian-mate docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} fi - docker push ${PUSHIMAGE}:ubuntu-mate + docker push ${PUSHIMAGE}:debian-mate docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then @@ -763,10 +763,10 @@ pipeline { fi for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-ubuntu-mate + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-debian-mate docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-ubuntu-mate + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-debian-mate docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -774,9 +774,9 @@ pipeline { fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-ubuntu-mate + docker push ${MANIFESTIMAGE}:amd64-debian-mate docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-ubuntu-mate + docker push ${MANIFESTIMAGE}:arm64v8-debian-mate docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -784,7 +784,7 @@ pipeline { fi done for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker buildx imagetools create -t ${MANIFESTIMAGE}:ubuntu-mate ${MANIFESTIMAGE}:amd64-ubuntu-mate ${MANIFESTIMAGE}:arm64v8-ubuntu-mate + docker buildx imagetools create -t ${MANIFESTIMAGE}:debian-mate ${MANIFESTIMAGE}:amd64-debian-mate ${MANIFESTIMAGE}:arm64v8-debian-mate docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then @@ -799,7 +799,7 @@ pipeline { // If this is a public release tag it in the LS Github stage('Github-Tag-Push-Release') { when { - branch "ubuntu-mate" + branch "debian-mate" expression { env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -811,14 +811,14 @@ pipeline { sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ -d '{"tag":"'${META_TAG}'",\ "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to ubuntu-mate",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to debian-mate",\ "type": "commit",\ "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json echo '{"tag_name":"'${META_TAG}'",\ - "target_commitish": "ubuntu-mate",\ + "target_commitish": "debian-mate",\ "name": "'${META_TAG}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start printf '","draft": false,"prerelease": true}' >> releasebody.json @@ -829,14 +829,14 @@ pipeline { // Add protection to the release branch stage('Github-Release-Branch-Protection') { when { - branch "ubuntu-mate" + branch "debian-mate" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } steps { - echo "Setting up protection for release branch ubuntu-mate" + echo "Setting up protection for release branch debian-mate" sh '''#! /bin/bash - curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/ubuntu-mate/protection \ + curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/debian-mate/protection \ -d $(jq -c . << EOF { "required_status_checks": null, diff --git a/README.md b/README.md index a99a72cd..0c55a4fb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ - + Up to date documentation is available [here](https://github.com/linuxserver/docker-rdesktop/blob/master/README.md). diff --git a/jenkins-vars.yml b/jenkins-vars.yml index a6ac2927..d35beb51 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -4,8 +4,8 @@ project_name: docker-rdesktop external_type: os release_type: prerelease -release_tag: ubuntu-mate -ls_branch: ubuntu-mate +release_tag: debian-mate +ls_branch: debian-mate build_armhf: false repo_vars: - BUILD_VERSION_ARG = 'OS_VERSION' diff --git a/root/etc/apt/preferences.d/firefox-no-snap b/root/etc/apt/preferences.d/firefox-no-snap deleted file mode 100644 index 9406bcc0..00000000 --- a/root/etc/apt/preferences.d/firefox-no-snap +++ /dev/null @@ -1,3 +0,0 @@ -Package: firefox* -Pin: release o=Ubuntu* -Pin-Priority: -1 diff --git a/root/usr/bin/exo-open b/root/usr/bin/exo-open new file mode 100755 index 00000000..87d07324 --- /dev/null +++ b/root/usr/bin/exo-open @@ -0,0 +1,7 @@ +#! /bin/bash + +if [ "${2}" == "WebBrowser" ]; then + /usr/bin/xdg-open /usr/share/applications/chromium.desktop +else + /usr/bin/exo-open-real "$@" +fi diff --git a/root/usr/local/bin/wrapped-chromium b/root/usr/local/bin/wrapped-chromium new file mode 100755 index 00000000..bfad4dad --- /dev/null +++ b/root/usr/local/bin/wrapped-chromium @@ -0,0 +1,15 @@ +#! /bin/bash + +BIN=/usr/bin/chromium + +# Cleanup +if ! pgrep chromium > /dev/null;then + rm -f $HOME/.config/chromium/Singleton* +fi + +# Run normally on privved containers or modified un non priv +if grep -q 'Seccomp:.0' /proc/1/status; then + ${BIN} --password-store=basic "$@" +else + ${BIN} --password-store=basic --no-sandbox --test-type "$@" +fi