rebase to alpine 3.19

This commit is contained in:
thelamer 2023-12-08 11:57:25 -08:00
parent 38af2760f0
commit 4c77aee5cb
5 changed files with 11 additions and 10 deletions

View File

@ -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_GIMP_MASTER\". ****"
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_GIMP_MASTER\`" >> $GITHUB_STEP_SUMMARY
echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/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:'"gimp"'$/,/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.18/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"gimp"'$/,/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:'"gimp"'$/,/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 gimp tag latest is detected, however not all arch repos are updated yet. Will try again later."

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine318
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319
# set version label
ARG BUILD_DATE
@ -13,11 +13,12 @@ ENV TITLE=GIMP
RUN \
echo "**** install packages ****" && \
if [ -z ${GIMP_VERSION+x} ]; then \
GIMP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
GIMP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:gimp$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache \
gimp==${GIMP_VERSION} && \
sed -i 's|</applications>| <application title="GNU*" type="normal">\n <maximized>yes</maximized>\n </application>\n</applications>|' /etc/xdg/openbox/rc.xml && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine318
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319
# set version label
ARG BUILD_DATE
@ -13,7 +13,7 @@ ENV TITLE=GIMP
RUN \
echo "**** install packages ****" && \
if [ -z ${GIMP_VERSION+x} ]; then \
GIMP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
GIMP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:gimp$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache \

4
Jenkinsfile vendored
View File

@ -24,8 +24,8 @@ pipeline {
DEV_DOCKERHUB_IMAGE = 'lsiodev/gimp'
PR_DOCKERHUB_IMAGE = 'lspipepr/gimp'
DIST_IMAGE = 'alpine'
DIST_TAG = '3.18'
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/community/'
DIST_TAG = '3.19'
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/'
DIST_REPO_PACKAGES = 'gimp'
MULTIARCH = 'true'
CI = 'true'

View File

@ -16,8 +16,8 @@ repo_vars:
- DEV_DOCKERHUB_IMAGE = 'lsiodev/gimp'
- PR_DOCKERHUB_IMAGE = 'lspipepr/gimp'
- DIST_IMAGE = 'alpine'
- DIST_TAG = '3.18'
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/community/'
- DIST_TAG = '3.19'
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/'
- DIST_REPO_PACKAGES = 'gimp'
- MULTIARCH = 'true'
- CI = 'true'