Rebase to 3.22

.github/workflows/external_trigger.yml

@@ -26,7 +26,7 @@ jobs:
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
           echo "> External trigger running off of master branch. To disable this trigger, add \`smokeping_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"smokeping"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^smokeping_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
@@ -104,7 +104,7 @@ jobs:
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
             echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
-          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"smokeping"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
+          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"smokeping"'$/,/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" >> $GITHUB_STEP_SUMMARY
             FAILURE_REASON="New version ${EXT_RELEASE} for smokeping tag latest is detected, however not all arch repos are updated yet. Will try again later."
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:3.22
 
 # set version label
 ARG BUILD_DATE
@@ -12,7 +12,7 @@ LABEL maintainer="notdriz"
 RUN \
   echo "**** install packages ****" && \
   if [ -z ${SMOKEPING_VERSION+x} ]; then \
-    SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add --no-cache --virtual=build-dependencies \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.22
 
 # set version label
 ARG BUILD_DATE
@@ -12,7 +12,7 @@ LABEL maintainer="notdriz"
 RUN \
   echo "**** install packages ****" && \
   if [ -z ${SMOKEPING_VERSION+x} ]; then \
-    SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add --no-cache --virtual=build-dependencies \

Jenkinsfile

@@ -27,8 +27,7 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/smokeping'
     PR_DOCKERHUB_IMAGE = 'lspipepr/smokeping'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.20'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/main/'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main/'
     DIST_REPO_PACKAGES = 'smokeping'
     MULTIARCH='true'
     CI='true'

README.md

@@ -296,6 +296,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **03.06.25:** - Rebase to Alpine 3.22.
 * **27.07.24:** - Add additional dependency packages for InfluxDB.
 * **25.06.24:** - Rebase to Alpine 3.20.
 * **12.04.24:** - Added perl InfluxDB HTTP module for InfluxDB HTTP support.

jenkins-vars.yml

@@ -15,8 +15,7 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/smokeping'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/smokeping'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.20'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/main/'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main/'
   - DIST_REPO_PACKAGES = 'smokeping'
   - MULTIARCH='true'
   - CI='true'

readme-vars.yml

@@ -87,6 +87,7 @@ init_diagram: |
   "smokeping:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "03.06.25:", desc: "Rebase to Alpine 3.22. Update TCPPing. Add curl probe."}
   - {date: "27.07.24:", desc: "Add additional dependency packages for InfluxDB."}
   - {date: "25.06.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "12.04.24:", desc: "Added perl InfluxDB HTTP module for InfluxDB HTTP support."}

root/defaults/httpd.conf

@@ -123,7 +123,7 @@ LoadModule log_config_module modules/mod_log_config.so
 #LoadModule logio_module modules/mod_logio.so
 LoadModule env_module modules/mod_env.so
 #LoadModule mime_magic_module modules/mod_mime_magic.so
-#LoadModule expires_module modules/mod_expires.so
+LoadModule expires_module modules/mod_expires.so
 LoadModule headers_module modules/mod_headers.so
 #LoadModule usertrack_module modules/mod_usertrack.so
 #LoadModule unique_id_module modules/mod_unique_id.so
@@ -271,13 +271,16 @@ DocumentRoot "/var/www/localhost/htdocs"
 # is requested.
 #
 <IfModule dir_module>
-    DirectoryIndex index.html smokeping.cgi 
+    DirectoryIndex index.html smokeping.cgi
 </IfModule>
 
 # rewrite incoming root requeststo correct subpath
 RewriteEngine On
 RewriteRule ^/$ /smokeping/ [R]
 
+# Set max-age for image files to 300 seconds (5 minutes)
+ExpiresActive On
+ExpiresByType image/* A300
 
 #
 # The following lines prevent .htaccess and .htpasswd files from being

root/defaults/smoke-conf/Probes

@@ -19,3 +19,11 @@ forks = 10
 offset = random
 pings = 5
 port = 80
+
++ Curl
+binary = /usr/bin/curl
+forks = 5
+offset = 50%
+step = 300
+pings = 5
+urlformat = http://%host%/

root/defaults/smoke-conf/Targets

@@ -74,7 +74,7 @@ host = cixp.web.cern.ch
 
 menu = SBB
 title = SBB
-host = www.sbb.ch/en
+host = www.sbb.ch
 
 ++ UK
 
@@ -91,7 +91,7 @@ host = cam.ac.uk
 
 menu = UEA
 title = UEA
-host = www.uea.ac.uk
+host = uea.ac.uk
 
 + USA