From 7c8c446f7d66e722162f458552c2453176fbf77c Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 22 Nov 2024 10:28:15 +0000 Subject: [PATCH 1/3] Bumping version to 4.2.13 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3fca978..a85ba9b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.12 \ No newline at end of file +4.2.13 \ No newline at end of file From 158e55a25a0a8c648da0503d8139622052dce00e Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 22 Nov 2024 10:28:20 +0000 Subject: [PATCH 2/3] Using new /test executable --- .github/workflows/dev.yml | 2 +- test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index f9c7a49..8f3329a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -71,7 +71,7 @@ jobs: name: Run tests id: docker_test run: | - docker run --entrypoint "/usr/bin/env" ${{ env.TEST_TAG }} -i nu -c "use bf test ; test" + docker run --entrypoint /test ${{ env.TEST_TAG }} - name: Build and push id: docker_build diff --git a/test.sh b/test.sh index fc68462..5b1addc 100644 --- a/test.sh +++ b/test.sh @@ -13,4 +13,4 @@ docker buildx build \ -t ${TAG} \ . \ && \ - docker run --entrypoint "/usr/bin/env" ${TAG} -i nu -c "use bf test ; test" + docker run --entrypoint /test ${TAG} From 7ee1dec770e3219502ff1b6d6c5cca3e5c9d087d Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 22 Nov 2024 10:28:36 +0000 Subject: [PATCH 3/3] Using latest base images --- alpine3.15/Dockerfile | 2 +- alpine3.16/Dockerfile | 2 +- alpine3.17/Dockerfile | 2 +- alpine3.18/Dockerfile | 2 +- alpine3.19/Dockerfile | 2 +- alpine3.20/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile index cec08ed..63448ce 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.4.14 +FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.4.15 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index 989b934..a0ad986 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.4.14 +FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.4.15 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index d1a1bb4..80c5e9e 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.4.14 +FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.4.15 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index e7aa0f9..f9a7ac0 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.4.14 +FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.4.15 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index 103875f..4d01e71 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.14 +FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.15 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index df5cb31..e3be164 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.14 +FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 873e556..518533b 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="5.4.14" +BASE_VERSION="5.4.15" echo "Base: ${BASE_VERSION}" ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20"