diff --git a/.github/workflows/container-validation.yml b/.github/workflows/container-validation.yml index 3a0975d..6a015ac 100644 --- a/.github/workflows/container-validation.yml +++ b/.github/workflows/container-validation.yml @@ -25,19 +25,19 @@ jobs: build_args: "ubuntu_version_code=noble" simplerisk-minimal-php84: - name: 'Verify simplerisk/simplerisk-minimal image based on PHP 8.4 with Apache' + name: 'Verify simplerisk/simplerisk-minimal image based on PHP 8.3 with Apache' uses: ./.github/workflows/verify-image_rw.yml with: context_path: "simplerisk-minimal/" dockerfile_path: "simplerisk-minimal/Dockerfile" image_tag: "simplerisk/simplerisk-minimal:testing" - build_args: "php_version=8.4" + build_args: "php_version=8.3" simplerisk-minimal-php85: - name: 'Verify simplerisk/simplerisk-minimal image based on PHP 8.5 with Apache' + name: 'Verify simplerisk/simplerisk-minimal image based on PHP 8.4 with Apache' uses: ./.github/workflows/verify-image_rw.yml with: context_path: "simplerisk-minimal/" dockerfile_path: "simplerisk-minimal/Dockerfile" image_tag: "simplerisk/simplerisk-minimal:testing" - build_args: "php_version=8.5" + build_args: "php_version=8.4" diff --git a/.github/workflows/push-to-dockerhub.yml b/.github/workflows/push-to-dockerhub.yml index e387afd..b3ec7b1 100644 --- a/.github/workflows/push-to-dockerhub.yml +++ b/.github/workflows/push-to-dockerhub.yml @@ -37,27 +37,27 @@ jobs: build_args: "ubuntu_version_code=noble" secrets: inherit simplerisk-minimal-php84: - name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.4 with Apache' + name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.3 with Apache' uses: ./.github/workflows/push-to-dockerhub_rw.yml with: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/Dockerfile" image_name: "simplerisk/simplerisk-minimal" version: "20260422-001" - os_version: "php84" - build_args: "php_version=8.4" + os_version: "php83" + build_args: "php_version=8.3" platforms: linux/amd64,linux/arm64 secrets: inherit simplerisk-minimal-php85: - name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.5 with Apache' + name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.4 with Apache' uses: ./.github/workflows/push-to-dockerhub_rw.yml with: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/Dockerfile" image_name: "simplerisk/simplerisk-minimal" version: "20260422-001" - os_version: "php85" + os_version: "php84" main_image: true - build_args: "php_version=8.5" + build_args: "php_version=8.4" platforms: linux/amd64,linux/arm64 secrets: inherit diff --git a/.github/workflows/push-to-gh-pkgs.yml b/.github/workflows/push-to-gh-pkgs.yml index 0d511a0..e46c98e 100644 --- a/.github/workflows/push-to-gh-pkgs.yml +++ b/.github/workflows/push-to-gh-pkgs.yml @@ -37,25 +37,25 @@ jobs: build_args: "ubuntu_version_code=noble" secrets: inherit simplerisk-minimal-php84: - name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.4 with Apache' + name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.3 with Apache' uses: ./.github/workflows/push-to-gh-pkgs_rw.yml with: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/Dockerfile" image_name: "simplerisk-minimal" version: "20260422-001" - os_version: "php84" - build_args: "php_version=8.4" + os_version: "php83" + build_args: "php_version=8.3" secrets: inherit simplerisk-minimal-php85: - name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.5 with Apache' + name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.4 with Apache' uses: ./.github/workflows/push-to-gh-pkgs_rw.yml with: context_path: "simplerisk-minimal" dockerfile_path: "simplerisk-minimal/Dockerfile" image_name: "simplerisk-minimal" version: "20260422-001" - os_version: "php85" + os_version: "php84" main_image: true - build_args: "php_version=8.5" + build_args: "php_version=8.4" secrets: inherit diff --git a/simplerisk-minimal/Dockerfile b/simplerisk-minimal/Dockerfile index dd44cbc..5ee68bf 100644 --- a/simplerisk-minimal/Dockerfile +++ b/simplerisk-minimal/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile generated by script -ARG php_version=8.5 +ARG php_version=8.4 FROM alpine/curl:8.12.1 AS downloader diff --git a/simplerisk-minimal/generate_dockerfile.sh b/simplerisk-minimal/generate_dockerfile.sh index 7a3461a..433fd1a 100755 --- a/simplerisk-minimal/generate_dockerfile.sh +++ b/simplerisk-minimal/generate_dockerfile.sh @@ -15,7 +15,7 @@ fi cat << EOF > "${SCRIPT_LOCATION}/Dockerfile" # Dockerfile generated by script -ARG php_version=8.5 +ARG php_version=8.4 EOF