Skip to content

Commit 3d5405d

Browse files
committed
rebase to 3.21
1 parent dba6969 commit 3d5405d

File tree

7 files changed

+26
-22
lines changed

7 files changed

+26
-22
lines changed

.github/workflows/external_trigger.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
2424
echo "> External trigger running off of master branch. To disable this trigger, add \`pidgin_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
2525
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
26-
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
26+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2727
&& awk '/^P:'"pidgin"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
2828
echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY
2929
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
@@ -44,16 +44,18 @@ jobs:
4444
token=$(curl -sX GET \
4545
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fpidgin%3Apull" \
4646
| jq -r '.token')
47-
multidigest=$(curl -s \
48-
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
49-
--header "Authorization: Bearer ${token}" \
50-
"https://ghcr.io/v2/${image}/manifests/${tag}" \
51-
| jq -r 'first(.manifests[].digest)')
52-
digest=$(curl -s \
53-
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
54-
--header "Authorization: Bearer ${token}" \
55-
"https://ghcr.io/v2/${image}/manifests/${multidigest}" \
56-
| jq -r '.config.digest')
47+
multidigest=$(curl -s \
48+
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
49+
--header "Accept: application/vnd.oci.image.index.v1+json" \
50+
--header "Authorization: Bearer ${token}" \
51+
"https://ghcr.io/v2/${image}/manifests/${tag}")
52+
multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
53+
digest=$(curl -s \
54+
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
55+
--header "Accept: application/vnd.oci.image.manifest.v1+json" \
56+
--header "Authorization: Bearer ${token}" \
57+
"https://ghcr.io/v2/${image}/manifests/${multidigest}" \
58+
| jq -r '.config.digest')
5759
image_info=$(curl -sL \
5860
--header "Authorization: Bearer ${token}" \
5961
"https://ghcr.io/v2/${image}/blobs/${digest}")
@@ -77,7 +79,7 @@ jobs:
7779
if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
7880
echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
7981
exit 0
80-
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"pidgin"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
82+
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"pidgin"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
8183
echo "New version \`${EXT_RELEASE}\` found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
8284
FAILURE_REASON="New version ${EXT_RELEASE} for pidgin tag latest is detected, however not all arch repos are updated yet. Will try again later."
8385
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build stage
2-
FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as plugins
2+
FROM ghcr.io/linuxserver/baseimage-alpine:3.21 as plugins
33

44
RUN \
55
echo "**** install dev deps ****" && \
@@ -102,7 +102,7 @@ RUN \
102102
make DESTDIR="/buildout" install
103103

104104
# runtime stage
105-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine320
105+
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine321
106106

107107
# set version label
108108
ARG BUILD_DATE
@@ -125,7 +125,7 @@ RUN \
125125
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/pidgin-logo.png && \
126126
echo "**** install packages ****" && \
127127
if [ -z ${PIDGIN_VERSION+x} ]; then \
128-
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
128+
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
129129
&& awk '/^P:pidgin$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
130130
fi && \
131131
apk add --no-cache \

Dockerfile.aarch64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build stage
2-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as plugins
2+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21 as plugins
33

44
RUN \
55
echo "**** install dev deps ****" && \
@@ -102,7 +102,7 @@ RUN \
102102
make DESTDIR="/buildout" install
103103

104104
# runtime stage
105-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine320
105+
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine321
106106

107107
# set version label
108108
ARG BUILD_DATE
@@ -125,7 +125,7 @@ RUN \
125125
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/pidgin-logo.png && \
126126
echo "**** install packages ****" && \
127127
if [ -z ${PIDGIN_VERSION+x} ]; then \
128-
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
128+
PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
129129
&& awk '/^P:pidgin$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
130130
fi && \
131131
apk add --no-cache \

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ pipeline {
2727
DEV_DOCKERHUB_IMAGE = 'lsiodev/pidgin'
2828
PR_DOCKERHUB_IMAGE = 'lspipepr/pidgin'
2929
DIST_IMAGE = 'alpine'
30-
DIST_TAG = '3.20'
31-
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/community/'
30+
DIST_TAG = '3.21'
31+
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.21/community/'
3232
DIST_REPO_PACKAGES = 'pidgin'
3333
MULTIARCH = 'true'
3434
CI = 'true'

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
398398

399399
## Versions
400400

401+
* **06.12.24:** - Rebase to Alpine 3.21.
401402
* **23.05.24:** - Rebase to Alpine 3.20.
402403
* **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon.
403404
* **17.01.24:** - Switch from Chromium to Firefox.

jenkins-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ repo_vars:
1616
- DEV_DOCKERHUB_IMAGE = 'lsiodev/pidgin'
1717
- PR_DOCKERHUB_IMAGE = 'lspipepr/pidgin'
1818
- DIST_IMAGE = 'alpine'
19-
- DIST_TAG = '3.20'
20-
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/community/'
19+
- DIST_TAG = '3.21'
20+
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.21/community/'
2121
- DIST_REPO_PACKAGES = 'pidgin'
2222
- MULTIARCH = 'true'
2323
- CI = 'true'

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ init_diagram: |
101101
"pidgin:latest" <- Base Images
102102
# changelog
103103
changelogs:
104+
- {date: "06.12.24:", desc: "Rebase to Alpine 3.21."}
104105
- {date: "23.05.24:", desc: "Rebase to Alpine 3.20."}
105106
- {date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon."}
106107
- {date: "17.01.24:", desc: "Switch from Chromium to Firefox."}

0 commit comments

Comments
 (0)