v4.3.0 (#95)

bfren · web-flow · commit c692c0f06c47 · 2024-12-06T17:07:57.000Z
Major updates
* Adding Alpine 3.21 and making it the default

Minor updates
* Using latest base images
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20" ]
+        alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21" ]
     runs-on: ubuntu-latest
     steps:
       -
@@ -92,7 +92,7 @@ jobs:
       -
         name: Build and push default
         id: docker_build_default
-        if: matrix.alpine == '3.20'
+        if: matrix.alpine == '3.21'
         uses: docker/build-push-action@v6
         with:
           context: .
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20" ]
+        alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21" ]
     runs-on: ubuntu-latest
     steps:
       -
@@ -88,7 +88,7 @@ jobs:
       -
         name: Build and push default
         id: docker_build_default
-        if: matrix.alpine == '3.20'
+        if: matrix.alpine == '3.21'
         uses: docker/build-push-action@v6
         with:
           context: .
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.2.13
+4.3.0
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-4.2
+4.3
diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"
 
diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"
 
diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"
 
diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"
 
diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"
 
diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"
 
diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile
@@ -0,0 +1,21 @@
+FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.0
+
+LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"
+
+ARG BF_IMAGE
+ARG BF_PUBLISHING
+ARG BF_VERSION
+
+EXPOSE 80
+
+COPY ./overlay /
+COPY ./alpine3.21/overlay /
+
+ENV \
+    # set to 1 if you want to stop the container generating default httpd.conf at startup -
+    # if you do this you'll need to provide your own using a bind point
+    BF_APACHE_USE_CUSTOM_CONF=0
+
+RUN bf-install
+
+VOLUME [ "/www" ]
diff --git a/alpine3.21/overlay/tmp/APACHE_BUILD b/alpine3.21/overlay/tmp/APACHE_BUILD
@@ -0,0 +1 @@
+2.4.62-r0
diff --git a/alpine3.21/overlay/tmp/APACHE_REVISION b/alpine3.21/overlay/tmp/APACHE_REVISION
@@ -0,0 +1 @@
+2.4.62
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -4,10 +4,10 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="5.4.15"
+BASE_VERSION="5.5.0"
 echo "Base: ${BASE_VERSION}"
 
-ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20"
+ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21"
 for V in ${ALPINE_EDITIONS} ; do
 
     echo "Apache for Alpine ${V}"
diff --git a/run.sh b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IMAGE=`cat VERSION`
-ALPINE=${1:-3.18}
+ALPINE=${1:-3.21}
 
 docker buildx build \
     --load \
diff --git a/test.sh b/test.sh
@@ -2,7 +2,7 @@
 
 IMAGE=apache
 VERSION=`cat VERSION`
-ALPINE=${1:-3.19}
+ALPINE=${1:-3.21}
 TAG=${IMAGE}-test
 
 docker buildx build \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.4.15`
	`1`	`+FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.5.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15`
	`1`	`+FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"`
`4`	`4`