Skip to content

Commit

Permalink
create legacy symlinks for upgrades and drop aarch64 support
Browse files Browse the repository at this point in the history
  • Loading branch information
thelamer committed Nov 25, 2024
1 parent e66e121 commit 2dfff61
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 56 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/issue.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ body:
label: CPU architecture
options:
- x86-64
- arm64
validations:
required: true
- type: textarea
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/external_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,10 @@ jobs:
token=$(curl -sX GET \
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fdigikam%3Apull" \
| jq -r '.token')
multidigest=$(curl -s \
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
--header "Authorization: Bearer ${token}" \
"https://ghcr.io/v2/${image}/manifests/${tag}" \
| jq -r 'first(.manifests[].digest)')
digest=$(curl -s \
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
--header "Authorization: Bearer ${token}" \
"https://ghcr.io/v2/${image}/manifests/${multidigest}" \
"https://ghcr.io/v2/${image}/manifests/${tag}" \
| jq -r '.config.digest')
image_info=$(curl -sL \
--header "Authorization: Bearer ${token}" \
Expand Down
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ RUN \
mv \
/usr/bin/chromium \
/usr/bin/chromium-real && \
echo '#!/bin/bash' > /usr/sbin/digikam && \
echo 'cd /opt/digikam && ./AppRun' >> /usr/sbin/digikam && \
chmod +x /usr/sbin/digikam && \
ln -s \
/usr/bin/chromium \
/usr/bin/firefox && \
echo "**** cleanup ****" && \
apt-get autoclean && \
rm -rf \
Expand Down
41 changes: 0 additions & 41 deletions Dockerfile.aarch64

This file was deleted.

2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pipeline {
DEV_DOCKERHUB_IMAGE = 'lsiodev/digikam'
PR_DOCKERHUB_IMAGE = 'lspipepr/digikam'
DIST_IMAGE = 'ubuntu'
MULTIARCH = 'true'
MULTIARCH = 'false'
CI = 'true'
CI_WEB = 'true'
CI_PORT = '3000'
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ The architectures supported by this image are:
| Architecture | Available | Tag |
| :----: | :----: | ---- |
| x86-64 || amd64-\<version tag\> |
| arm64 | | arm64v8-\<version tag\> |
| arm64 | | |
| armhf || |

## Application Setup
Expand Down Expand Up @@ -115,7 +115,7 @@ To install cjk fonts on startup as an example pass the environment variables (Al

```
-e DOCKER_MODS=linuxserver/mods:universal-package-install
-e INSTALL_PACKAGES=noto-fonts-cjk
-e INSTALL_PACKAGES=fonts-noto-cjk
-e LC_ALL=zh_CN.UTF-8
```

Expand Down Expand Up @@ -411,7 +411,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **25.11.24:** - Rebase to Debian for x86_64 using official appimage.
* **25.11.24:** - Rebase to Debian using official appimage, drop aarch64 support.
* **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon.
* **05.09.23:** - Add openexr dependency.
* **18.03.23:** - Rebase to KasmVNC base image.
Expand Down
2 changes: 1 addition & 1 deletion jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repo_vars:
- DEV_DOCKERHUB_IMAGE = 'lsiodev/digikam'
- PR_DOCKERHUB_IMAGE = 'lspipepr/digikam'
- DIST_IMAGE = 'ubuntu'
- MULTIARCH = 'true'
- MULTIARCH = 'false'
- CI = 'true'
- CI_WEB = 'true'
- CI_PORT = '3000'
Expand Down
5 changes: 2 additions & 3 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ project_blurb_optional_extras_enabled: false
# supported architectures
available_architectures:
- { arch: "{{ arch_x86_64 }}", tag: "latest"}
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}

# development version
development_versions: false
Expand Down Expand Up @@ -41,7 +40,7 @@ kasm_blurb: true
show_nvidia: true
external_http_port: "3000"
external_https_port: "3001"
noto_fonts: "noto-fonts-cjk"
noto_fonts: "fonts-noto-cjk"

# application setup block
app_setup_block_enabled: true
Expand All @@ -57,7 +56,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "25.11.24:", desc: "Rebase to Debian for x86_64 using official appimage." }
- { date: "25.11.24:", desc: "Rebase to Debian using official appimage, drop aarch64 support." }
- { date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon." }
- { date: "05.09.23:", desc: "Add openexr dependency." }
- { date: "18.03.23:", desc: "Rebase to KasmVNC base image." }
Expand Down

0 comments on commit 2dfff61

Please sign in to comment.