From 7945ef87a8ce403134aa727d3a7ec9714f24137a Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 2 Jan 2024 10:30:36 -0800 Subject: [PATCH] rebase to Alpine 3.19 --- .github/workflows/external_trigger.yml | 4 ++-- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 1 + 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index b760a466..acc1f72b 100755 --- 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_WIRESHARK_MASTER\". ****" echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_WIRESHARK_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:'"wireshark"'$/,/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:'"wireshark"'$/,/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:'"wireshark"'$/,/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 wireshark tag latest is detected, however not all arch repos are updated yet. Will try again later." diff --git a/Dockerfile b/Dockerfile index 61051914..7aaf8b7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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,7 +13,7 @@ ENV TITLE=Wireshark RUN \ echo "**** install packages ****" && \ if [ -z ${WIRESHARK_VERSION+x} ]; then \ - WIRESHARK_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + WIRESHARK_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:wireshark$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 61051914..7aaf8b7f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -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,7 +13,7 @@ ENV TITLE=Wireshark RUN \ echo "**** install packages ****" && \ if [ -z ${WIRESHARK_VERSION+x} ]; then \ - WIRESHARK_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + WIRESHARK_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:wireshark$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Jenkinsfile b/Jenkinsfile index fd3593c9..b6fa02c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,8 +24,8 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/wireshark' PR_DOCKERHUB_IMAGE = 'lspipepr/wireshark' 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 = 'wireshark' MULTIARCH = 'true' CI = 'true' diff --git a/README.md b/README.md index 44ea237c..3b232805 100644 --- a/README.md +++ b/README.md @@ -339,6 +339,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. * **23.10.22:** - Rebase to Alpine 3.16, migrate to s6v3. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 6a25cc39..1756ae18 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -16,8 +16,8 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/wireshark' - PR_DOCKERHUB_IMAGE = 'lspipepr/wireshark' - 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 = 'wireshark' - MULTIARCH = 'true' - CI = 'true' diff --git a/readme-vars.yml b/readme-vars.yml index 9bb5e1f5..61cdc8bd 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -83,6 +83,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: "23.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }