Skip to content

v2.3.0 #133

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
merged 2 commits into from
Dec 6, 2024
Merged

v2.3.0 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34df917
Bumping version to 2.3.0
bfren Dec 6, 2024
54e9786
Adding PHP 8.4.1
bfren Dec 6, 2024
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 @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ]
php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
runs-on: ubuntu-latest
steps:
-
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
-
name: Build and push default tags
id: docker_build_default
if: matrix.php == '8.3'
if: matrix.php == '8.4'
uses: docker/build-push-action@v6
with:
file: ./${{ matrix.php }}/Dockerfile
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:
php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ]
php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
runs-on: ubuntu-latest
steps:
-
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
-
name: Build and push default tags
id: docker_build_default
if: matrix.php == '8.3'
if: matrix.php == '8.4'
uses: docker/build-push-action@v6
with:
context: .
Expand Down
2 changes: 1 addition & 1 deletion 7.4/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/alpine:alpine3.15-2.7.5
FROM ghcr.io/bfren/alpine:alpine3.15-2.8.0

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

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

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion 8.2/ALPINE_MINOR
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.20
3.21
2 changes: 1 addition & 1 deletion 8.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/alpine:alpine3.20-2.7.5
FROM ghcr.io/bfren/alpine:alpine3.21-2.8.0

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

Expand Down
2 changes: 1 addition & 1 deletion 8.3/ALPINE_MINOR
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.20
3.21
2 changes: 1 addition & 1 deletion 8.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/alpine:alpine3.20-2.7.5
FROM ghcr.io/bfren/alpine:alpine3.21-2.8.0

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

Expand Down
1 change: 1 addition & 0 deletions 8.4/ALPINE_MINOR
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.21
26 changes: 26 additions & 0 deletions 8.4/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM ghcr.io/bfren/alpine:alpine3.21-2.8.0

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

ARG BF_IMAGE
ARG BF_PUBLISHING
ARG BF_VERSION

COPY ./overlay /
COPY ./8.4/overlay /

ENV \
# PHP config directory
BF_PHP_DIR="/etc/php84" \
# offical php.ini template to download
BF_PHP_ENV="production" \
# space-separated extensions to install
BF_PHP_EXT= \
# PHP package prefix
BF_PHP_PREFIX="php84"

RUN bf-install

VOLUME [ "/ws" ]

ENTRYPOINT [ "/init" ]
1 change: 1 addition & 0 deletions 8.4/PHP_PREFIX
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
php84
1 change: 1 addition & 0 deletions 8.4/overlay/tmp/PHP_BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8.4.1-r0
1 change: 1 addition & 0 deletions 8.4/overlay/tmp/PHP_REVISION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8.4.1
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.22
2.3.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 @@
2.2
2.3
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="2.7.5"
BASE_VERSION="2.8.0"
echo "Base: ${BASE_VERSION}"

PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3"
PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4"
for V in ${PHP_VERSIONS} ; do

echo "PHP ${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`
PHP=${1:-8.3}
PHP=${1:-8.4}

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=php
VERSION=`cat VERSION`
PHP=${1:-8.3}
PHP=${1:-8.4}
TAG=${IMAGE}-test

docker buildx build \
Expand Down
Loading