Skip to content

v5.1.0 #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bfren merged 5 commits into from
Dec 5, 2025
Merged

v5.1.0 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6b9302
Bumping version to 5.0.2
bfren Dec 5, 2025
b2ec25d
Adding Alpine 3.23
bfren Dec 5, 2025
d2ac9ce
Bumping version to 5.1.0
bfren Dec 5, 2025
d2902e4
Making Alpine 3.23 the default
bfren Dec 5, 2025
8c4efc1
Using latest base images
bfren Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21", "3.22" ]
alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21", "3.22", "3.23" ]
runs-on: ubuntu-latest
steps:
-
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
-
name: Build and push default
id: docker_build_default
if: matrix.alpine == '3.22'
if: matrix.alpine == '3.23'
uses: docker/build-push-action@v6
with:
context: .
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21", "3.22" ]
alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21", "3.22", "3.23" ]
runs-on: ubuntu-latest
steps:
-
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
-
name: Build and push default
id: docker_build_default
if: matrix.alpine == '3.22'
if: matrix.alpine == '3.23'
uses: docker/build-push-action@v6
with:
context: .
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.1
5.1.0
2 changes: 1 addition & 1 deletion VERSION_MINOR
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0
5.1
2 changes: 1 addition & 1 deletion alpine3.15/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.15-6.0.1
FROM quay.io/bfren/alpine-s6:alpine3.15-6.1.0

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"

Expand Down
2 changes: 1 addition & 1 deletion alpine3.16/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.16-6.0.1
FROM quay.io/bfren/alpine-s6:alpine3.16-6.1.0

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"

Expand Down
2 changes: 1 addition & 1 deletion alpine3.17/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.17-6.0.1
FROM quay.io/bfren/alpine-s6:alpine3.17-6.1.0

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"

Expand Down
2 changes: 1 addition & 1 deletion alpine3.18/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.18-6.0.1
FROM quay.io/bfren/alpine-s6:alpine3.18-6.1.0

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"

Expand Down
2 changes: 1 addition & 1 deletion alpine3.19/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.19-6.0.1
FROM quay.io/bfren/alpine-s6:alpine3.19-6.1.0

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"

Expand Down
2 changes: 1 addition & 1 deletion alpine3.20/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.20-6.0.1
FROM quay.io/bfren/alpine-s6:alpine3.20-6.1.0

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"

Expand Down
2 changes: 1 addition & 1 deletion alpine3.21/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.21-6.0.1
FROM quay.io/bfren/alpine-s6:alpine3.21-6.1.0

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"

Expand Down
2 changes: 1 addition & 1 deletion alpine3.22/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1
FROM quay.io/bfren/alpine-s6:alpine3.22-6.1.0

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"

Expand Down
21 changes: 21 additions & 0 deletions alpine3.23/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM quay.io/bfren/alpine-s6:alpine3.23-6.1.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.23/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" ]
1 change: 1 addition & 0 deletions alpine3.23/overlay/tmp/APACHE_BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.4.65-r0
1 change: 1 addition & 0 deletions alpine3.23/overlay/tmp/APACHE_REVISION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.4.65
4 changes: 2 additions & 2 deletions generate-dockerfiles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set -euo pipefail

docker pull bfren/alpine

BASE_VERSION="6.0.1"
BASE_VERSION="6.1.0"
echo "Base: ${BASE_VERSION}"

ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22"
ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22 3.23"
for V in ${ALPINE_EDITIONS} ; do

echo "Apache for Alpine ${V}"
Expand Down
2 changes: 1 addition & 1 deletion run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

IMAGE=`cat VERSION`
ALPINE=${1:-3.21}
ALPINE=${1:-3.23}

docker buildx build \
--load \
Expand Down
2 changes: 1 addition & 1 deletion test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

IMAGE=apache
VERSION=`cat VERSION`
ALPINE=${1:-3.21}
ALPINE=${1:-3.23}
TAG=${IMAGE}-test

docker buildx build \
Expand Down