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
15 changes: 6 additions & 9 deletions .github/workflows/service_docker-build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ jobs:
- name: Move PHP Versions file
run: mv ./artifacts/php-versions.yml ${{ inputs.php-versions-file }}

- name: Set up Depot CLI
uses: depot/setup-action@v1

##
# Docker build & publish
##
Expand All @@ -111,12 +114,6 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: "πŸ“¦ Assemble the Docker Tags"
run: |
chmod +x ./scripts/assemble-docker-tags.sh
Expand Down Expand Up @@ -167,11 +164,11 @@ jobs:
echo "nginx_arg=NGINX_VERSION=$VERSION" >> $GITHUB_OUTPUT

- name: Build images
uses: docker/build-push-action@v6
uses: depot/build-push-action@v1
with:
project: ${{ secrets.DEPOT_PROJECT_ID }}
token: ${{ secrets.DEPOT_PROJECT_TOKEN }}
file: src/variations/${{ matrix.php_variation }}/Dockerfile
cache-from: type=gha
cache-to: type=gha
build-args: |
BASE_OS_VERSION=${{ matrix.base_os }}
PHP_VERSION=${{ matrix.patch_version }}
Expand Down
14 changes: 7 additions & 7 deletions scripts/conf/php-versions-base-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,31 +95,31 @@ operating_systems:
- name: "Alpine 3.20"
version: alpine3.20
number: 3.20
nginx_version: 1.28.1-r1
nginx_version: 1.28.2-r1
- name: "Alpine 3.21"
version: alpine3.21
number: 3.21
nginx_version: 1.28.1-r1
nginx_version: 1.28.2-r1
- name: "Alpine 3.22"
version: alpine3.22
number: 3.22
nginx_version: 1.28.1-r1
nginx_version: 1.28.2-r1
- name: "Alpine 3.23"
version: alpine3.23
number: 3.23
nginx_version: 1.28.1-r1
nginx_version: 1.28.2-r1
- family: debian
default: true
versions:
- name: "Debian Bullseye"
version: bullseye
number: 11
nginx_version: 1.28.1-1~bullseye
nginx_version: 1.28.2-1~bullseye
- name: "Debian Bookworm"
version: bookworm
number: 12
nginx_version: 1.28.1-1~bookworm
nginx_version: 1.28.2-1~bookworm
- name: "Debian Trixie"
version: trixie
number: 13
nginx_version: 1.28.1-1~trixie
nginx_version: 1.28.2-1~trixie
Loading