Skip to content

Commit

Permalink
rebase to Alpine 3.19
Browse files Browse the repository at this point in the history
  • Loading branch information
thelamer committed Jan 2, 2024
1 parent 97ebd34 commit 37e0ed7
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/external_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ****"
Expand Down Expand Up @@ -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."
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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 ****" && \
Expand All @@ -9,6 +9,7 @@ RUN \
git \
glib-dev \
imagemagick \
imagemagick-svg \
json-glib-dev \
libgcrypt-dev \
libpng-dev \
Expand Down Expand Up @@ -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
Expand All @@ -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 \
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -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 ****" && \
Expand All @@ -9,6 +9,7 @@ RUN \
git \
glib-dev \
imagemagick \
imagemagick-svg \
json-glib-dev \
libgcrypt-dev \
libpng-dev \
Expand Down Expand Up @@ -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
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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." }
Expand Down

0 comments on commit 37e0ed7

Please sign in to comment.