From 1f623caaacb008f846d392af9f53fcdd9c276dd5 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 21 Jan 2024 10:40:53 -0800 Subject: [PATCH] rebase to Alpine 3.19 --- .github/workflows/external_trigger.yml | 4 ++-- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 1 + 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 1dce988..6f7d306 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -20,7 +20,7 @@ jobs: echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_DARKTABLE_MASTER\". ****" echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_DARKTABLE_MASTER\`" >> $GITHUB_STEP_SUMMARY echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:'"darktable"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" @@ -74,7 +74,7 @@ jobs: echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY exit 0 - elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"darktable"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then + elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"darktable"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then echo "**** New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting ****" echo "New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY FAILURE_REASON="New version ${EXT_RELEASE} for darktable tag latest is detected, however not all arch repos are updated yet. Will try again later." diff --git a/Dockerfile b/Dockerfile index ec43159..d55eec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine317 +FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319 # set version label ARG BUILD_DATE @@ -13,7 +13,7 @@ ENV TITLE=darktable RUN \ echo "**** install packages ****" && \ if [ -z ${DARKTABLE_VERSION+x} ]; then \ - DARKTABLE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + DARKTABLE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:darktable$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index efae872..4306016 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine317 +FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319 # set version label ARG BUILD_DATE @@ -13,7 +13,7 @@ ENV TITLE=darktable RUN \ echo "**** install packages ****" && \ if [ -z ${DARKTABLE_VERSION+x} ]; then \ - DARKTABLE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + DARKTABLE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:darktable$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Jenkinsfile b/Jenkinsfile index 0942292..521c8f3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,8 +25,8 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/darktable' PR_DOCKERHUB_IMAGE = 'lspipepr/darktable' DIST_IMAGE = 'alpine' - DIST_TAG = '3.17' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/community/' + DIST_TAG = '3.19' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/' DIST_REPO_PACKAGES = 'darktable' MULTIARCH = 'true' CI = 'true' diff --git a/README.md b/README.md index 647bcc2..61a4a26 100644 --- a/README.md +++ b/README.md @@ -311,6 +311,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **21.01.24:** - Rebase to Alpine 3.19. * **18.03.23:** - Rebase to KasmVNC base image. * **23.10.22:** - Rebase to Alpine 3.16, migrate to s6v3. * **31.12.21:** - Rebase to Alpine 3.15. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 150b315..3cb7e41 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -16,8 +16,8 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/darktable' - PR_DOCKERHUB_IMAGE = 'lspipepr/darktable' - DIST_IMAGE = 'alpine' - - DIST_TAG = '3.17' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/community/' + - DIST_TAG = '3.19' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/' - DIST_REPO_PACKAGES = 'darktable' - MULTIARCH = 'true' - CI = 'true' diff --git a/readme-vars.yml b/readme-vars.yml index 5fd0baa..d5b6b89 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -73,6 +73,7 @@ app_setup_block: | # changelog changelogs: + - { date: "21.01.24:", desc: "Rebase to Alpine 3.19." } - { date: "18.03.23:", desc: "Rebase to KasmVNC base image." } - { date: "23.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." } - { date: "31.12.21:", desc: "Rebase to Alpine 3.15." }