Rebase to 3.22

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
@@ -21,5 +21,5 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.22/ \
     yq=="${YQ_VERSION}"

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
@@ -21,5 +21,5 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.22/ \
     yq=="${YQ_VERSION}"

Jenkinsfile

@@ -823,7 +823,7 @@ pipeline {
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
                 -e NODE_NAME=\"${NODE_NAME}\" \
-                -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:${SYFT_IMAGE_TAG}}\" \
+                -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
                 -t ghcr.io/linuxserver/ci:latest \
                 python3 test_build.py'''
         }

README.md

@@ -52,7 +52,6 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ❌ | |
 
 ## Usage
 
@@ -147,16 +146,17 @@ docker build \
   -t linuxserver/yq:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
 
-```text
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+```bash
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
 
 ## Versions
 
+* **09.07.25:** - Rebase to Alpine 3.22.
 * **29.05.24:** - Rebase to Alpine 3.20.
 * **08.01.24:** - Rebase to Alpine 3.19.
 * **19.09.22:** - Rebase to Alpine 3.18, deprecate armhf.

readme-vars.yml

@@ -57,7 +57,6 @@ full_custom_readme: |
   | :----: | :----: | ---- |
   | x86-64 | ✅ | amd64-\<version tag\> |
   | arm64 | ✅ | arm64v8-\<version tag\> |
-  | armhf | ❌ | |
 
   ## Usage
 
@@ -152,16 +151,17 @@ full_custom_readme: |
     -t linuxserver/yq:latest .
   ```
 
-  The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+  The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
 
-  ```text
-  docker run --rm --privileged multiarch/qemu-user-static:register --reset
+  ```bash
+  docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
   ```
 
   Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
 
   ## Versions
 
+  * **09.07.25:** - Rebase to Alpine 3.22.
   * **29.05.24:** - Rebase to Alpine 3.20.
   * **08.01.24:** - Rebase to Alpine 3.19.
   * **19.09.22:** - Rebase to Alpine 3.18, deprecate armhf.