Skip to content

Commit 3866ed9

Browse files
committed
Update composer to 2.7.6, simplify actions workflow
1 parent c9f0882 commit 3866ed9

File tree

2 files changed

+47
-68
lines changed

2 files changed

+47
-68
lines changed

.github/workflows/docker-images.yml

-61
This file was deleted.

.github/workflows/docker.yml

+47-7
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,50 @@ jobs:
1212
latest: true
1313
- php_version: 8.2
1414
latest: false
15-
uses: "./.github/workflows/docker-images.yml"
16-
with:
17-
php_version: ${{ matrix.php_version }}
18-
latest: ${{ matrix.latest }}
19-
debian_version: bookworm
20-
postgresql_version: "16"
21-
composer_version: "2.7.4"
15+
env:
16+
debian_version: bookworm
17+
postgresql_version: "16"
18+
composer_version: "2.7.6"
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
22+
23+
- name: Build the base image
24+
uses: tweedegolf/build-container-image@main
25+
with:
26+
token: ${{ secrets.GITHUB_TOKEN }}
27+
context: "${{ matrix.php_version }}"
28+
file: "${{ matrix.php_version }}/Dockerfile"
29+
push: ${{ github.ref == 'refs/heads/main' }}
30+
platforms: "linux/amd64,linux/arm64"
31+
build-args: |
32+
DEBIAN_VERSION=${{ env.debian_version }}
33+
POSTGRESQL_VERSION=${{ env.postgresql_version }}
34+
COMPOSER_VERSION=${{ env.composer_version }}
35+
tags: |
36+
ghcr.io/tweedegolf/php:${{matrix.php_version}}
37+
${{ matrix.latest && 'ghcr.io/tweedegolf/php:latest' || '' }}
38+
39+
- name: Build the development image
40+
uses: tweedegolf/build-container-image@main
41+
with:
42+
token: ${{ secrets.GITHUB_TOKEN }}
43+
context: "${{ matrix.php_version }}"
44+
file: "${{ matrix.php_version }}/Dockerfile.dev"
45+
push: ${{ github.ref == 'refs/heads/main' }}
46+
platforms: "linux/amd64,linux/arm64"
47+
tags: |
48+
ghcr.io/tweedegolf/php:${{matrix.php_version}}-dev
49+
${{ matrix.latest && 'ghcr.io/tweedegolf/php:latest-dev' || '' }}
50+
51+
- name: Build the debugging image
52+
uses: tweedegolf/build-container-image@main
53+
with:
54+
token: ${{ secrets.GITHUB_TOKEN }}
55+
context: "${{ matrix.php_version }}"
56+
file: "${{ matrix.php_version }}/Dockerfile.debug"
57+
push: ${{ github.ref == 'refs/heads/main' }}
58+
platforms: "linux/amd64,linux/arm64"
59+
tags: |
60+
ghcr.io/tweedegolf/php:${{matrix.php_version}}-debug
61+
${{ matrix.latest && 'ghcr.io/tweedegolf/php:latest-debug' || '' }}

0 commit comments

Comments
 (0)