From 06278e6554d7a7f5a108af9e5220b8d142f51bbe Mon Sep 17 00:00:00 2001
From: Markus Fensterer <markus.fensterer@x-cellent.com>
Date: Thu, 18 Jun 2026 15:43:09 +0200
Subject: [PATCH 1/2] prepare usage of community sonic 202606

---
 .github/workflows/base-image.yaml   |  3 +--
 Makefile                            |  5 ++---
 images/sonic/Dockerfile             |  4 ++--
 images/sonic/base-202605/Dockerfile | 23 +++++++++++++++++++++++
 4 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 images/sonic/base-202605/Dockerfile

diff --git a/.github/workflows/base-image.yaml b/.github/workflows/base-image.yaml
index 039e6f01..8017d6cf 100644
--- a/.github/workflows/base-image.yaml
+++ b/.github/workflows/base-image.yaml
@@ -13,9 +13,8 @@ jobs:
     strategy:
       matrix:
         versions:
-          - name: 202311
-          - name: 202411
           - name: 202505
+          - name: 202605
 
     steps:
     - name: Log in to the container registry
diff --git a/Makefile b/Makefile
index 052da8e8..a3505483 100644
--- a/Makefile
+++ b/Makefile
@@ -427,9 +427,8 @@ test-connectivity-to-external-service-via-ipv6:
 
 .PHONY: build-sonic-base
 build-sonic-base:
-	docker build -t ghcr.io/metal-stack/mini-lab-sonic-base:202311 images/sonic/base-202311
-	docker build -t ghcr.io/metal-stack/mini-lab-sonic-base:202411 images/sonic/base-202411
-	docker build -t ghcr.io/metal-stack/mini-lab-sonic-base:202505 images/sonic/base-202505
+#	docker build -t ghcr.io/metal-stack/mini-lab-sonic-base:202505 images/sonic/base-202505
+	docker build -t ghcr.io/metal-stack/mini-lab-sonic-base:202605 images/sonic/base-202605
 
 ## DEV TARGETS ##
 
diff --git a/images/sonic/Dockerfile b/images/sonic/Dockerfile
index fe262415..8a787f5f 100644
--- a/images/sonic/Dockerfile
+++ b/images/sonic/Dockerfile
@@ -14,8 +14,8 @@ RUN apt-get update && \
         qemu-system-x86 \
         telnet
 
-COPY --from=ghcr.io/metal-stack/mini-lab-sonic-base:202505 /sonic-vs.img /sonic-vs.img
-COPY --from=ghcr.io/metal-stack/mini-lab-sonic-base:202505 /frr-pythontools.deb /frr-pythontools.deb
+COPY --from=ghcr.io/metal-stack/mini-lab-sonic-base:202605 /sonic-vs.img /sonic-vs.img
+COPY --from=ghcr.io/metal-stack/mini-lab-sonic-base:202605 /frr-pythontools.deb /frr-pythontools.deb
 
 ENTRYPOINT ["/launch.py"]
 
diff --git a/images/sonic/base-202605/Dockerfile b/images/sonic/base-202605/Dockerfile
new file mode 100644
index 00000000..691e0e16
--- /dev/null
+++ b/images/sonic/base-202605/Dockerfile
@@ -0,0 +1,23 @@
+# Check: https://sonic-build.azurewebsites.net/ui/sonic/pipelines
+ARG SONIC_BASE_URL=https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=202605&platform=vs
+ARG SONIC_IMG_URL=${SONIC_BASE_URL}&target=target%2Fsonic-vs.img.gz
+ARG FRR_RELOAD_URL=${SONIC_BASE_URL}&target=target%2Fdebs%2Fbookworm%2Ffrr-pythontools_10.5.4-sonic-0_all.deb
+
+FROM docker.io/library/busybox:stable AS download
+ARG SONIC_IMG_URL
+ARG FRR_RELOAD_URL
+
+ADD "${SONIC_IMG_URL}" /sonic-vs.img.gz
+ADD "${FRR_RELOAD_URL}" /frr-pythontools.deb
+
+RUN gunzip /sonic-vs.img.gz
+
+FROM scratch
+ARG SONIC_IMG_URL
+ARG FRR_RELOAD_URL
+
+LABEL sonic-img-url=${SONIC_IMG_URL} \
+      frr-reload-url=${FRR_RELOAD_URL}
+
+COPY --from=download /frr-pythontools.deb /frr-pythontools.deb
+COPY --from=download /sonic-vs.img /sonic-vs.img

From 3775910058092b9d04dfc9c9bdecdd02f6475435 Mon Sep 17 00:00:00 2001
From: Markus Fensterer <markus.fensterer@x-cellent.com>
Date: Thu, 18 Jun 2026 15:50:22 +0200
Subject: [PATCH 2/2] only build 202605

---
 .github/workflows/base-image.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/base-image.yaml b/.github/workflows/base-image.yaml
index 8017d6cf..facac64d 100644
--- a/.github/workflows/base-image.yaml
+++ b/.github/workflows/base-image.yaml
@@ -13,7 +13,6 @@ jobs:
     strategy:
       matrix:
         versions:
-          - name: 202505
           - name: 202605
 
     steps: