From c45b7e5f0435dce8c2970a514a375bc69fcf0446 Mon Sep 17 00:00:00 2001 From: Kris Simon Date: Wed, 30 Oct 2024 22:24:05 +0100 Subject: [PATCH 1/7] Swift 6.0.2 --- README.md | 2 +- buildbox.dockerfile | 2 +- src/entrypoint-build.sh | 2 +- src/entrypoint-test.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b5d73ec..9489b95 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Buildbox versioning correlates to a Swift Version and a Playwright Version. | **2.1** | 5.9.1 | 1.39.0 | | **2.2** | 5.9.2 | 1.39.0 | | **2.3** | 5.9.2 | 1.42.1 | - +| **3.0** | 6.0.2 | 1.42.1 | ## Support For help with the toolchain please visit our [discourse](https://discourse.uitsmijter.io) server. diff --git a/buildbox.dockerfile b/buildbox.dockerfile index 394b2c1..b44533c 100644 --- a/buildbox.dockerfile +++ b/buildbox.dockerfile @@ -1,7 +1,7 @@ # ---------------------------------------------------------------------------------------- # Uitsmijter Swift Buildbox # ---------------------------------------------------------------------------------------- -ARG BASEIMAGE=swift:5.9.2-jammy +ARG BASEIMAGE=swift:6.0.2-noble FROM ${BASEIMAGE} as build LABEL maintainer="aus der Technik" diff --git a/src/entrypoint-build.sh b/src/entrypoint-build.sh index 8ad3da2..6fed99f 100755 --- a/src/entrypoint-build.sh +++ b/src/entrypoint-build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash echo "" -echo "Uitsmijter Buildbox 2.3.0 | Swift 5.9.2" +echo "Uitsmijter Buildbox 3.0.0 | Swift 6.0.2" echo "------------------------------------------------------------" echo "Visit: https://docs.uitsmijter.io" echo "" diff --git a/src/entrypoint-test.sh b/src/entrypoint-test.sh index 2d6669a..b3a0394 100755 --- a/src/entrypoint-test.sh +++ b/src/entrypoint-test.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash echo "" -echo "Uitsmijter TestRunner 2.3.0 | Swift 5.9.2" +echo "Uitsmijter TestRunner 3.0.0 | Swift 6.0.2" echo "------------------------------------------------------------" echo "Visit: https://docs.uitsmijter.io" echo "" From 121ace3478c6ea7a2ba07b2721265366839db081 Mon Sep 17 00:00:00 2001 From: Kris Simon Date: Wed, 30 Oct 2024 18:36:32 +0100 Subject: [PATCH 2/7] use github-slug-action v4 # Conflicts: # .github/workflows/feature.yaml # .github/workflows/release-candidate.yaml --- .github/workflows/feature.yaml | 2 +- .github/workflows/release-candidate.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/feature.yaml b/.github/workflows/feature.yaml index f368f94..a32e2e2 100644 --- a/.github/workflows/feature.yaml +++ b/.github/workflows/feature.yaml @@ -36,7 +36,7 @@ jobs: - name: E2E Runner Build and Push Docker Image uses: docker/build-push-action@v5 with: - push: false + push: true platforms: linux/amd64,linux/arm64 file: e2e.dockerfile tags: | diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml index 599bfe3..8699d2c 100644 --- a/.github/workflows/release-candidate.yaml +++ b/.github/workflows/release-candidate.yaml @@ -24,7 +24,7 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@4.4.1 + uses: rlespinasse/github-slug-action@v4 - name: Buildbox Build and Push Docker Image uses: docker/build-push-action@v5 with: From ecdfd8fcac96f3c6872efe0767db01be72c71e60 Mon Sep 17 00:00:00 2001 From: Kris Simon Date: Wed, 30 Oct 2024 22:28:09 +0100 Subject: [PATCH 3/7] rlespinasse/github-slug-action@v4 --- .github/workflows/feature.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/feature.yaml b/.github/workflows/feature.yaml index a32e2e2..5422c37 100644 --- a/.github/workflows/feature.yaml +++ b/.github/workflows/feature.yaml @@ -24,7 +24,7 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@4.4.1 + uses: rlespinasse/github-slug-action@v4 - name: Buildbox Build and Push Docker Image uses: docker/build-push-action@v5 with: From ac7115357e0bb038908f08671fd931aca8117d16 Mon Sep 17 00:00:00 2001 From: Kris Simon Date: Wed, 30 Oct 2024 22:45:36 +0100 Subject: [PATCH 4/7] Push feature buildbox --- .github/workflows/feature.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/feature.yaml b/.github/workflows/feature.yaml index 5422c37..31c0820 100644 --- a/.github/workflows/feature.yaml +++ b/.github/workflows/feature.yaml @@ -28,7 +28,7 @@ jobs: - name: Buildbox Build and Push Docker Image uses: docker/build-push-action@v5 with: - push: false + push: true platforms: linux/amd64,linux/arm64 file: buildbox.dockerfile tags: | From a1ac0c74b85b627f213b33b0488d8f8d1e94cd94 Mon Sep 17 00:00:00 2001 From: Kris Simon Date: Wed, 1 Oct 2025 14:06:07 +0200 Subject: [PATCH 5/7] update to 6.2.0 --- README.md | 1 + buildbox.dockerfile | 2 +- src/entrypoint-build.sh | 2 +- src/entrypoint-test.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9489b95..1c51f8d 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ Buildbox versioning correlates to a Swift Version and a Playwright Version. | **2.2** | 5.9.2 | 1.39.0 | | **2.3** | 5.9.2 | 1.42.1 | | **3.0** | 6.0.2 | 1.42.1 | +| **4.0** | 6.2.0 | 1.42.1 | ## Support For help with the toolchain please visit our [discourse](https://discourse.uitsmijter.io) server. diff --git a/buildbox.dockerfile b/buildbox.dockerfile index b44533c..6ce431a 100644 --- a/buildbox.dockerfile +++ b/buildbox.dockerfile @@ -1,7 +1,7 @@ # ---------------------------------------------------------------------------------------- # Uitsmijter Swift Buildbox # ---------------------------------------------------------------------------------------- -ARG BASEIMAGE=swift:6.0.2-noble +ARG BASEIMAGE=swift:6.2.0-noble FROM ${BASEIMAGE} as build LABEL maintainer="aus der Technik" diff --git a/src/entrypoint-build.sh b/src/entrypoint-build.sh index 6fed99f..065974d 100755 --- a/src/entrypoint-build.sh +++ b/src/entrypoint-build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash echo "" -echo "Uitsmijter Buildbox 3.0.0 | Swift 6.0.2" +echo "Uitsmijter Buildbox 3.0.0 | Swift 6.2.0" echo "------------------------------------------------------------" echo "Visit: https://docs.uitsmijter.io" echo "" diff --git a/src/entrypoint-test.sh b/src/entrypoint-test.sh index b3a0394..fdc0e7c 100755 --- a/src/entrypoint-test.sh +++ b/src/entrypoint-test.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash echo "" -echo "Uitsmijter TestRunner 3.0.0 | Swift 6.0.2" +echo "Uitsmijter TestRunner 3.0.0 | Swift 6.2.0" echo "------------------------------------------------------------" echo "Visit: https://docs.uitsmijter.io" echo "" From dec8e6e0871899c45c3b738f972b53c253b77b2f Mon Sep 17 00:00:00 2001 From: Kris Simon Date: Wed, 1 Oct 2025 14:12:15 +0200 Subject: [PATCH 6/7] update version information --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1c51f8d..c3d9b30 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ Buildbox versioning correlates to a Swift Version and a Playwright Version. | **2.1** | 5.9.1 | 1.39.0 | | **2.2** | 5.9.2 | 1.39.0 | | **2.3** | 5.9.2 | 1.42.1 | +| **2.4** | 5.9.2 | 1.42.1 | | **3.0** | 6.0.2 | 1.42.1 | | **4.0** | 6.2.0 | 1.42.1 | From 295372abf03abdc5e3e2eb1fec645a1e2cbc772b Mon Sep 17 00:00:00 2001 From: Kris Simon Date: Wed, 1 Oct 2025 16:00:41 +0200 Subject: [PATCH 7/7] Build a kubectl intermediate container to replace bitnami/kubectl. --- e2e.dockerfile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/e2e.dockerfile b/e2e.dockerfile index 33ae98b..2a6fb64 100644 --- a/e2e.dockerfile +++ b/e2e.dockerfile @@ -1,7 +1,21 @@ # ---------------------------------------------------------------------------------------- # Kubernetes kubectl # ---------------------------------------------------------------------------------------- -FROM bitnami/kubectl AS kubectl +FROM debian:bullseye AS kubectl + +ENV DEBIAN_FRONTEND=noninteractive +ENV DEBCONF_NONINTERACTIVE_SEEN=true +RUN apt update -q \ + && apt dist-upgrade -q -y \ + && apt install -y apt-utils apt-transport-https +RUN apt install -y \ + curl + +ENV ARCH=$(arch) +WORKDIR /bin +RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/${ARCH}/kubectl" + + # ---------------------------------------------------------------------------------------- # E2E TEST RUNTIME @@ -20,7 +34,7 @@ RUN apt install -y \ yamllint # Kubernetes & Helm -COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl +COPY --from=kubectl /bin/kubectl /usr/bin/kubectl RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash WORKDIR /tests