From 37e0ed757e8eecc9c94707421ad68c9dea8590ad Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 2 Jan 2024 10:47:09 -0800 Subject: [PATCH] rebase to Alpine 3.19 --- .github/workflows/external_trigger.yml | 4 ++-- Dockerfile | 7 ++++--- Dockerfile.aarch64 | 7 ++++--- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 1 + 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index bbff3c0..d0e8b9e 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_PIDGIN_MASTER\". ****" echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_PIDGIN_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:'"pidgin"'$/,/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:'"pidgin"'$/,/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:'"pidgin"'$/,/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 pidgin tag latest is detected, however not all arch repos are updated yet. Will try again later." diff --git a/Dockerfile b/Dockerfile index 3900baa..ffaae2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM ghcr.io/linuxserver/baseimage-alpine:3.18 as plugins +FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as plugins RUN \ echo "**** install dev deps ****" && \ @@ -9,6 +9,7 @@ RUN \ git \ glib-dev \ imagemagick \ + imagemagick-svg \ json-glib-dev \ libgcrypt-dev \ libpng-dev \ @@ -101,7 +102,7 @@ RUN \ make DESTDIR="/buildout" install # runtime stage -FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine318 +FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319 # set version label ARG BUILD_DATE @@ -119,7 +120,7 @@ COPY --from=plugins /buildout/ / RUN \ echo "**** install packages ****" && \ if [ -z ${PIDGIN_VERSION+x} ]; then \ - PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:pidgin$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 16812f6..f3c3efa 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,5 +1,5 @@ # build stage -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 as plugins +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as plugins RUN \ echo "**** install dev deps ****" && \ @@ -9,6 +9,7 @@ RUN \ git \ glib-dev \ imagemagick \ + imagemagick-svg \ json-glib-dev \ libgcrypt-dev \ libpng-dev \ @@ -101,7 +102,7 @@ RUN \ make DESTDIR="/buildout" install # runtime stage -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine318 +FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319 # set version label ARG BUILD_DATE @@ -119,7 +120,7 @@ COPY --from=plugins /buildout/ / RUN \ echo "**** install packages ****" && \ if [ -z ${PIDGIN_VERSION+x} ]; then \ - PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:pidgin$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Jenkinsfile b/Jenkinsfile index c78da27..a8d90c4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,8 +24,8 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/pidgin' PR_DOCKERHUB_IMAGE = 'lspipepr/pidgin' 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 = 'pidgin' MULTIARCH = 'true' CI = 'true' diff --git a/README.md b/README.md index 99f8732..e475a59 100644 --- a/README.md +++ b/README.md @@ -348,6 +348,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **02.01.24:** - Rebase to Alpine 3.19. * **13.05.23:** - Rebase to Alpine 3.18. * **18.03.23:** - Rebase to KasmVNC base image. * **21.10.22:** - Rebase to Alpine 3.16, migrate to s6v3. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 48e057f..8713cd7 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -16,8 +16,8 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/pidgin' - PR_DOCKERHUB_IMAGE = 'lspipepr/pidgin' - 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 = 'pidgin' - MULTIARCH = 'true' - CI = 'true' diff --git a/readme-vars.yml b/readme-vars.yml index 1b0aafc..26f1bd5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -94,6 +94,7 @@ app_setup_block: | # changelog changelogs: + - { date: "02.01.24:", desc: "Rebase to Alpine 3.19." } - { date: "13.05.23:", desc: "Rebase to Alpine 3.18." } - { date: "18.03.23:", desc: "Rebase to KasmVNC base image." } - { date: "21.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }