diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml index 3abf571..b69ef33 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.yml +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -52,7 +52,6 @@ body: label: CPU architecture options: - x86-64 - - arm64 validations: required: true - type: textarea diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 6cd3e57..9731cff 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -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}" \ diff --git a/Dockerfile b/Dockerfile index 31bf4c9..02086a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 deleted file mode 100644 index 517dddd..0000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,41 +0,0 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-arch - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG DIGIKAM_VERSION -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="hackerman" - -# title -ENV TITLE=DigiKam - -RUN \ - echo "**** add icon ****" && \ - curl -o \ - /kclient/public/icon.png \ - https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/digikam-logo.png && \ - echo "**** install runtime packages ****" && \ - pacman -Sy --noconfirm --needed \ - breeze-icons \ - digikam \ - firefox \ - mariadb \ - openexr \ - perl-image-exiftool && \ - echo "**** image tweaks ****" && \ - ln -s \ - /usr/bin/vendor_perl/exiftool \ - /usr/bin/exiftool && \ - dbus-uuidgen > /etc/machine-id && \ - echo "**** cleanup ****" && \ - rm -rf \ - /tmp/* \ - /var/cache/pacman/pkg/* \ - /var/lib/pacman/sync/* - -# add local files -COPY /root / - -# ports and volumes -EXPOSE 3000 diff --git a/Jenkinsfile b/Jenkinsfile index c1451d9..207c187 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' diff --git a/README.md b/README.md index daf74a7..ab3f6b3 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ The architectures supported by this image are: | Architecture | Available | Tag | | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\ | -| arm64 | ✅ | arm64v8-\ | +| arm64 | ❌ | | | armhf | ❌ | | ## Application Setup @@ -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 ``` @@ -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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e1c3f16..f50b713 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -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' diff --git a/readme-vars.yml b/readme-vars.yml index f5c7faf..4b34ed7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -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 @@ -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 @@ -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." }