Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/external_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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."}
Expand Down
6 changes: 6 additions & 0 deletions root/usr/bin/chromium
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -15,4 +20,5 @@ ${BIN} \
--start-maximized \
--test-type \
--user-data-dir \
${WAYLAND} \
"$@" > /dev/null 2>&1