diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index bb16097..b3185a0 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -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_PIDGIN_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:'"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 ****" diff --git a/Dockerfile b/Dockerfile index cc288b1..9bf03b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM lsiobase/alpine:3.14 as plugins +FROM lsiobase/alpine:3.15 as plugins RUN \ echo "**** install dev deps ****" && \ @@ -117,13 +117,12 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ curl && \ if [ -z ${PIDGIN_VERSION+x} ]; then \ - PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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 \ discount \ firefox-esr \ - leafpad \ libpurple-bonjour \ libpurple-xmpp \ libwebp \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 13a07fc..b9c0423 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -117,13 +117,12 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ curl && \ if [ -z ${PIDGIN_VERSION+x} ]; then \ - PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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 \ discount \ firefox-esr \ - leafpad \ libpurple-bonjour \ libpurple-xmpp \ libwebp \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6ea00fa..23a0c1e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -117,13 +117,12 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ curl && \ if [ -z ${PIDGIN_VERSION+x} ]; then \ - PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + PIDGIN_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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 \ discount \ firefox-esr \ - leafpad \ libpurple-bonjour \ libpurple-xmpp \ libwebp \ diff --git a/Jenkinsfile b/Jenkinsfile index 778061c..400f6cb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,8 +25,8 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/pidgin' PR_DOCKERHUB_IMAGE = 'lspipepr/pidgin' 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 = 'pidgin' MULTIARCH = 'true' CI = 'true' diff --git a/README.md b/README.md index 4403677..4280443 100644 --- a/README.md +++ b/README.md @@ -248,5 +248,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.12.21:** - Rebase to Alpine 3.15. * **26.09.21:** - Rebase to Alpine 3.14. * **14.05.21:** - Initial release. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 6f2ace7..d84bbc0 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -15,8 +15,8 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/pidgin' - PR_DOCKERHUB_IMAGE = 'lspipepr/pidgin' - 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 = 'pidgin' - MULTIARCH = 'true' - CI = 'true' diff --git a/readme-vars.yml b/readme-vars.yml index 7a497e8..18965b7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -64,5 +64,6 @@ app_setup_block: | # changelog changelogs: + - { date: "23.12.21:", desc: "Rebase to Alpine 3.15." } - { date: "26.09.21:", desc: "Rebase to Alpine 3.14." } - { date: "14.05.21:", desc: "Initial release." } diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml index b57c320..04ac0a9 100644 --- a/root/defaults/menu.xml +++ b/root/defaults/menu.xml @@ -2,7 +2,6 @@ /usr/bin/xterm -/usr/bin/leafpad /usr/bin/firefox