Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 7.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /tmp
RUN \
# get the Nu scripts from the PHP image overlay
echo "Cloning Alpine overlay." && \
apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \
mkdir /overlay && \
mv docker-php/overlay/etc /overlay/

Expand All @@ -17,7 +17,7 @@ RUN \
# STAGE 1: create final image
#======================================================================================================================

FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.6 AS final
FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.7 AS final
COPY --from=php /overlay /

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
Expand Down
4 changes: 2 additions & 2 deletions 8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /tmp
RUN \
# get the Nu scripts from the PHP image overlay
echo "Cloning Alpine overlay." && \
apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \
mkdir /overlay && \
mv docker-php/overlay/etc /overlay/

Expand All @@ -17,7 +17,7 @@ RUN \
# STAGE 1: create final image
#======================================================================================================================

FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.6 AS final
FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.7 AS final
COPY --from=php /overlay /

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
Expand Down
4 changes: 2 additions & 2 deletions 8.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /tmp
RUN \
# get the Nu scripts from the PHP image overlay
echo "Cloning Alpine overlay." && \
apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \
mkdir /overlay && \
mv docker-php/overlay/etc /overlay/

Expand All @@ -17,7 +17,7 @@ RUN \
# STAGE 1: create final image
#======================================================================================================================

FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.6 AS final
FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.7 AS final
COPY --from=php /overlay /

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
Expand Down
4 changes: 2 additions & 2 deletions 8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /tmp
RUN \
# get the Nu scripts from the PHP image overlay
echo "Cloning Alpine overlay." && \
apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \
mkdir /overlay && \
mv docker-php/overlay/etc /overlay/

Expand All @@ -17,7 +17,7 @@ RUN \
# STAGE 1: create final image
#======================================================================================================================

FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.6 AS final
FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final
COPY --from=php /overlay /

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
Expand Down
4 changes: 2 additions & 2 deletions 8.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /tmp
RUN \
# get the Nu scripts from the PHP image overlay
echo "Cloning Alpine overlay." && \
apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \
mkdir /overlay && \
mv docker-php/overlay/etc /overlay/

Expand All @@ -17,7 +17,7 @@ RUN \
# STAGE 1: create final image
#======================================================================================================================

FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.6 AS final
FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final
COPY --from=php /overlay /

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
Expand Down
2 changes: 1 addition & 1 deletion 8.3/overlay/tmp/PHP_BUILD
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.3.24-r0
8.3.26-r0
2 changes: 1 addition & 1 deletion 8.3/overlay/tmp/PHP_REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.3.24
8.3.26
4 changes: 2 additions & 2 deletions 8.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /tmp
RUN \
# get the Nu scripts from the PHP image overlay
echo "Cloning Alpine overlay." && \
apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
apk add git && git clone --branch v2.4.6 https://github.com/bfren/docker-php.git && \
mkdir /overlay && \
mv docker-php/overlay/etc /overlay/

Expand All @@ -17,7 +17,7 @@ RUN \
# STAGE 1: create final image
#======================================================================================================================

FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.6 AS final
FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final
COPY --from=php /overlay /

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
Expand Down
2 changes: 1 addition & 1 deletion 8.4/overlay/tmp/PHP_BUILD
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.4.11-r0
8.4.13-r0
2 changes: 1 addition & 1 deletion 8.4/overlay/tmp/PHP_REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.4.11
8.4.13
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.5.1
7.5.2
4 changes: 2 additions & 2 deletions generate-dockerfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set -euo pipefail

docker pull bfren/alpine

BASE_VERSION="6.5.6"
PHP_BRANCH="v2.4.5"
BASE_VERSION="6.5.7"
PHP_BRANCH="v2.4.6"
PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4"

for V in ${PHP_VERSIONS} ; do
Expand Down
3 changes: 3 additions & 0 deletions overlay/etc/bf/init.d/22-php-ini.nu
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ export def main [] {
let override_values = bf fs read $x | from json
bf-php ini $override_values
} }

# return nothing
return
}
3 changes: 3 additions & 0 deletions overlay/etc/bf/init.d/23-www-conf.nu
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ export def main [] {
let override_values = bf fs read $x | from json
bf-php ini insert_or_replace_values_in_file $fpm_conf $override_values
} }

# return nothing
return
}