diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 4bb2d85..a553f0f 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -29,7 +29,7 @@ jobs: echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY echo "> External trigger running off of master branch. To disable this trigger, add \`zotero_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY - EXT_RELEASE=$(curl -sL https://www.zotero.org/download/ | awk -F'linux-x86_64' '/linux-x86_64/ {print $2}' | awk -F'"' '{print $3}') + EXT_RELEASE=$(curl -sL https://www.zotero.org/download/ | awk -F'linux-x86_64' '/linux-x86_64/ {print $2}' | awk -F'"' '{print $3}' | tail -n1) echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY if grep -q "^zotero_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY diff --git a/Dockerfile b/Dockerfile index bc40485..3f1eda9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,8 @@ RUN \ chromium-l10n \ lbzip2 \ libdbus-glib-1-2 \ - tint2 && \ + tint2 \ + xz-utils && \ echo "**** install zotero ****" && \ mkdir /opt/zotero && \ if [ -z ${ZOTERO_VERSION+x} ]; then \ @@ -35,10 +36,10 @@ RUN \ | tail -n1); \ fi && \ curl -o \ - /tmp/zotero.tar.bz2 -L \ - "https://download.zotero.org/client/release/${ZOTERO_VERSION}/Zotero-${ZOTERO_VERSION}_linux-x86_64.tar.bz2" && \ + /tmp/zotero.tar.xz -L \ + "https://download.zotero.org/client/release/${ZOTERO_VERSION}/Zotero-${ZOTERO_VERSION}_linux-x86_64.tar.xz" && \ tar xf \ - /tmp/zotero.tar.bz2 -C \ + /tmp/zotero.tar.xz -C \ /opt/zotero/ --strip-components=1 && \ ln -s \ /opt/zotero/zotero \ diff --git a/Jenkinsfile b/Jenkinsfile index 8db69c1..906f55a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -148,7 +148,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sL https://www.zotero.org/download/ | awk -F'linux-x86_64' '/linux-x86_64/ {print $2}' | awk -F'"' '{print $3}' ''', + script: ''' curl -sL https://www.zotero.org/download/ | awk -F'linux-x86_64' '/linux-x86_64/ {print $2}' | awk -F'"' '{print $3}' | tail -n1 ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index 2a397aa..3597886 100644 --- a/README.md +++ b/README.md @@ -612,6 +612,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **21.03.26:** - Use Wayland ozone platform for chromium fixes scaling and acceleration. * **28.12.25:** - Add Wayland init logic. * **22.09.25:** - Rebase to Debian Trixie. * **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 3b0cf63..fec8656 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-zotero external_type: na -custom_version_command: "curl -sL https://www.zotero.org/download/ | awk -F'linux-x86_64' '/linux-x86_64/ {print $2}' | awk -F'\"' '{print $3}'" +custom_version_command: "curl -sL https://www.zotero.org/download/ | awk -F'linux-x86_64' '/linux-x86_64/ {print $2}' | awk -F'\"' '{print $3}' | tail -n1" release_type: stable release_tag: latest ls_branch: master diff --git a/readme-vars.yml b/readme-vars.yml index f9a9739..601bb81 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -106,6 +106,7 @@ init_diagram: | "zotero:latest" <- Base Images # changelog changelogs: + - {date: "21.03.26:", desc: "Use Wayland ozone platform for chromium fixes scaling and acceleration."} - {date: "28.12.25:", desc: "Add Wayland init logic."} - {date: "22.09.25:", desc: "Rebase to Debian Trixie."} - {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."} diff --git a/root/usr/bin/chromium b/root/usr/bin/chromium index b8b75fa..b38ba3a 100755 --- a/root/usr/bin/chromium +++ b/root/usr/bin/chromium @@ -7,6 +7,11 @@ if ! pgrep chromium > /dev/null;then rm -f $HOME/.config/chromium/Singleton* fi +# Wayland check +if pgrep labwc > /dev/null 2>&1; then + WAYLAND="--ozone-platform=wayland" +fi + ${BIN} \ --no-first-run \ --no-sandbox \ @@ -15,4 +20,5 @@ ${BIN} \ --start-maximized \ --test-type \ --user-data-dir \ + ${WAYLAND} \ "$@" > /dev/null 2>&1