Merge pull request #5 from linuxserver/3.15

rebase to alpine 3.15
This commit is contained in:
aptalca 2022-01-01 14:19:32 -05:00 committed by GitHub
commit fa008b9a6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 7 deletions

View File

@ -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 ****"

View File

@ -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 \

View File

@ -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 \

4
Jenkinsfile vendored
View File

@ -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'

View File

@ -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.

View File

@ -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'

View File

@ -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." }