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
8 changes: 4 additions & 4 deletions .github/workflows/container-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
12 changes: 6 additions & 6 deletions .github/workflows/push-to-dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions .github/workflows/push-to-gh-pkgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion simplerisk-minimal/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion simplerisk-minimal/generate_dockerfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down