From cb889a95485fd82d06622dc7a5508f0219e6607c Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 31 Dec 2021 23:38:54 -0500 Subject: [PATCH] rebase to alpine 3.15 --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 1 + 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 0130597..6d7c04c 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_DARKTABLE_MASTER\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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 ****" diff --git a/Dockerfile b/Dockerfile index f02ee0e..c30165d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ curl && \ if [ -z ${DARKTABLE_VERSION+x} ]; then \ - DARKTABLE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + DARKTABLE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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 36a1c97..d1a60fe 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,7 +12,7 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ curl && \ if [ -z ${DARKTABLE_VERSION+x} ]; then \ - DARKTABLE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + DARKTABLE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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 347472d..49de333 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.14' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/' + DIST_TAG = '3.15' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/community/' DIST_REPO_PACKAGES = 'darktable' MULTIARCH = 'true' CI = 'true' diff --git a/README.md b/README.md index 766af0f..4b424db 100644 --- a/README.md +++ b/README.md @@ -226,5 +226,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **31.12.21:** - Rebase to Alpine 3.15. * **01.10.21:** - Rebase to Alpine 3.14. * **07.04.21:** - Initial release. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index a933b7b..31c5aa1 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -15,8 +15,8 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/darktable' - PR_DOCKERHUB_IMAGE = 'lspipepr/darktable' - DIST_IMAGE = 'alpine' - - DIST_TAG = '3.14' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/' + - DIST_TAG = '3.15' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/community/' - DIST_REPO_PACKAGES = 'darktable' - MULTIARCH = 'true' - CI = 'true' diff --git a/readme-vars.yml b/readme-vars.yml index f88c34c..feb323b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -42,5 +42,6 @@ app_setup_block: | # changelog changelogs: + - { date: "31.12.21:", desc: "Rebase to Alpine 3.15." } - { date: "01.10.21:", desc: "Rebase to Alpine 3.14." } - { date: "07.04.21:", desc: "Initial release." }