From e66e0e980dcd1d4c778bd1335d55b857f6675281 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 12 Oct 2023 23:21:11 +0100 Subject: [PATCH 1/9] Bumping version to 3.0.16 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 312883d..49b88e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.15 \ No newline at end of file +3.0.16 \ No newline at end of file From f2d86785dabf9ec2fd2b37d463883171a7566689 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 12 Oct 2023 23:21:15 +0100 Subject: [PATCH 2/9] Updating workflows --- .github/workflows/auto-pr.yml | 2 +- .github/workflows/dev.yml | 12 ++++++------ .github/workflows/publish.yml | 10 +++++----- .github/workflows/update-readme.yml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 213d5b8..ae26510 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout Branch ${{ github.ref_name }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create Pull Request uses: bfren/pull-request@v2 diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 73a94fa..c1796ca 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 build: strategy: fail-fast: false @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -35,20 +35,20 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ./${{ matrix.php }}/Dockerfile diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d8a7889..e341c43 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -46,20 +46,20 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ./${{ matrix.php }}/Dockerfile diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 14fd935..7fc7506 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -15,10 +15,10 @@ jobs: shell: bash - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From 0cd4481b6ce8718c7a363e9f576e41f218698687 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 9 Nov 2023 10:21:00 +0000 Subject: [PATCH 3/9] Bumping version to 4.0.0 --- VERSION | 2 +- VERSION_MAJOR | 2 +- VERSION_MINOR | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 49b88e3..0c89fc9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.16 \ No newline at end of file +4.0.0 \ No newline at end of file diff --git a/VERSION_MAJOR b/VERSION_MAJOR index e440e5c..bf0d87a 100644 --- a/VERSION_MAJOR +++ b/VERSION_MAJOR @@ -1 +1 @@ -3 \ No newline at end of file +4 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index f398a20..389f774 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -3.0 \ No newline at end of file +4.0 \ No newline at end of file From 5059f5923ed1c7923e57815c30e93c53b4580118 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 9 Nov 2023 10:21:06 +0000 Subject: [PATCH 4/9] Switching -beta to -dev tags --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index c1796ca..334a16c 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -59,7 +59,7 @@ jobs: platforms: linux/amd64,linux/arm/v7,linux/arm64 tags: | bfren/apache-php:php${{ matrix.php }}-dev - bfren/apache-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-beta + bfren/apache-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} From ffa40832f3eae112470f52945a7892a86892cab3 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 9 Nov 2023 10:21:11 +0000 Subject: [PATCH 5/9] Enforcing LF line endings --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..4ff3bd7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Always use LF endings. +* text eol=lf \ No newline at end of file From 0623771526e5601cc9252d0e79a9d2bfb5341c33 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 9 Nov 2023 10:22:40 +0000 Subject: [PATCH 6/9] Changing generate variable name --- 5.6/Dockerfile | 6 +++--- 7.4/Dockerfile | 6 +++--- 8.0/Dockerfile | 6 +++--- 8.1/Dockerfile | 6 +++--- 8.2/Dockerfile | 6 +++--- Dockerfile.esh | 8 ++++---- generate-dockerfiles.sh | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 6b7899a..6a5186c 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph ARG BF_IMAGE ARG BF_VERSION +COPY ./overlay / +COPY ./5.6/overlay / + ENV \ # PHP config directory PHP_DIR=/etc/php5 \ @@ -30,7 +33,4 @@ ENV \ # php.ini override: session_max_lifetime PHP_SESSION_MAX_LIFETIME=86400 -COPY ./overlay / -COPY ./5.6/overlay / - RUN bf-install diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 38cd0c0..417fd92 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph ARG BF_IMAGE ARG BF_VERSION +COPY ./overlay / +COPY ./7.4/overlay / + ENV \ # PHP config directory PHP_DIR=/etc/php7 \ @@ -30,7 +33,4 @@ ENV \ # php.ini override: session_max_lifetime PHP_SESSION_MAX_LIFETIME=86400 -COPY ./overlay / -COPY ./7.4/overlay / - RUN bf-install diff --git a/8.0/Dockerfile b/8.0/Dockerfile index d059a04..5099b2e 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph ARG BF_IMAGE ARG BF_VERSION +COPY ./overlay / +COPY ./8.0/overlay / + ENV \ # PHP config directory PHP_DIR=/etc/php8 \ @@ -30,7 +33,4 @@ ENV \ # php.ini override: session_max_lifetime PHP_SESSION_MAX_LIFETIME=86400 -COPY ./overlay / -COPY ./8.0/overlay / - RUN bf-install diff --git a/8.1/Dockerfile b/8.1/Dockerfile index e75342e..74b130d 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph ARG BF_IMAGE ARG BF_VERSION +COPY ./overlay / +COPY ./8.1/overlay / + ENV \ # PHP config directory PHP_DIR=/etc/php8 \ @@ -30,7 +33,4 @@ ENV \ # php.ini override: session_max_lifetime PHP_SESSION_MAX_LIFETIME=86400 -COPY ./overlay / -COPY ./8.1/overlay / - RUN bf-install diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 856f99a..3e7bdba 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph ARG BF_IMAGE ARG BF_VERSION +COPY ./overlay / +COPY ./8.2/overlay / + ENV \ # PHP config directory PHP_DIR=/etc/php8 \ @@ -30,7 +33,4 @@ ENV \ # php.ini override: session_max_lifetime PHP_SESSION_MAX_LIFETIME=86400 -COPY ./overlay / -COPY ./8.2/overlay / - RUN bf-install diff --git a/Dockerfile.esh b/Dockerfile.esh index 70008d0..448e3bb 100644 --- a/Dockerfile.esh +++ b/Dockerfile.esh @@ -1,10 +1,13 @@ -FROM bfren/apache:<%= ${APACHE_BASE} %>-<%= ${BASE_REVISION} %> +FROM bfren/apache:<%= ${APACHE_BASE} %>-<%= ${BASE_VERSION} %> LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php" ARG BF_IMAGE ARG BF_VERSION +COPY ./overlay / +COPY ./<%= ${PHP_MINOR} %>/overlay / + ENV \ # PHP config directory PHP_DIR=/etc/php<%= ${PHP_MAJOR} %> \ @@ -30,7 +33,4 @@ ENV \ # php.ini override: session_max_lifetime PHP_SESSION_MAX_LIFETIME=86400 -COPY ./overlay / -COPY ./<%= ${PHP_MINOR} %>/overlay / - RUN bf-install diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 2fd71e8..706bf7a 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_REVISION="3.0.10" -echo "Base: ${BASE_REVISION}" +BASE_VERSION="3.0.10" +echo "Base: ${BASE_VERSION}" PHP_VERSIONS="5.6 7.4 8.0 8.1 8.2" for V in ${PHP_VERSIONS} ; do @@ -19,7 +19,7 @@ for V in ${PHP_VERSIONS} ; do -e BF_DEBUG=0 \ bfren/alpine esh \ "/ws/Dockerfile.esh" \ - BASE_REVISION=${BASE_REVISION} \ + BASE_VERSION=${BASE_VERSION} \ APACHE_BASE=${APACHE_BASE} \ PHP_MAJOR=${PHP_MAJOR} \ PHP_MINOR=${V} From 8cfed8e8a46f134a51a48e553ca1188a92ef1f6f Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 9 Nov 2023 10:23:06 +0000 Subject: [PATCH 7/9] Updating to PHP 8.1.25 and 8.2.12 --- 8.1/overlay/tmp/PHP_BUILD | 2 +- 8.1/overlay/tmp/PHP_REVISION | 2 +- 8.2/overlay/tmp/PHP_BUILD | 2 +- 8.2/overlay/tmp/PHP_REVISION | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.1/overlay/tmp/PHP_BUILD b/8.1/overlay/tmp/PHP_BUILD index e01fb19..9633402 100644 --- a/8.1/overlay/tmp/PHP_BUILD +++ b/8.1/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.1.23-r0 \ No newline at end of file +8.1.25-r0 \ No newline at end of file diff --git a/8.1/overlay/tmp/PHP_REVISION b/8.1/overlay/tmp/PHP_REVISION index 90e30ae..c6da201 100644 --- a/8.1/overlay/tmp/PHP_REVISION +++ b/8.1/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.1.23 \ No newline at end of file +8.1.25 \ No newline at end of file diff --git a/8.2/overlay/tmp/PHP_BUILD b/8.2/overlay/tmp/PHP_BUILD index 2c28853..cca7170 100644 --- a/8.2/overlay/tmp/PHP_BUILD +++ b/8.2/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.2.10-r0 \ No newline at end of file +8.2.12-r0 \ No newline at end of file diff --git a/8.2/overlay/tmp/PHP_REVISION b/8.2/overlay/tmp/PHP_REVISION index 2004ae6..8f8090d 100644 --- a/8.2/overlay/tmp/PHP_REVISION +++ b/8.2/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.2.10 \ No newline at end of file +8.2.12 \ No newline at end of file From 9a53b95c3e81b896eb998344f7815235a5368f88 Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 29 Jan 2024 11:08:03 +0000 Subject: [PATCH 8/9] Updating copyright year to 2024 --- LICENSE | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 1674874..06c6f55 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 bfren +Copyright (c) 2020-2024 bfren Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index f0dd478..4d02914 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ Apache2 plus PHP (5.6, 7.4, 8.0, 8.1 and 8.2) - no SSL support etc, designed to ## Copyright -> Copyright (c) 2020-2023 [bfren](https://bfren.dev) (unless otherwise stated) +> Copyright (c) 2020-2024 [bfren](https://bfren.dev) (unless otherwise stated) From 77ba7e8553ca932599e7cd69cf6addc5db9d4957 Mon Sep 17 00:00:00 2001 From: bfren Date: Tue, 30 Jul 2024 16:39:57 +0100 Subject: [PATCH 9/9] Updating workflows --- .github/workflows/dev.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 334a16c..fd0b126 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -48,7 +48,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./${{ matrix.php }}/Dockerfile diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e341c43..2120a7c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -59,7 +59,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./${{ matrix.php }}/Dockerfile