Skip to content

Commit 7a35127

Browse files
paskalpaskal
committed
optimize: improve GitHub workflows with proper Docker actions and caching
- Replace manual docker buildx commands with docker/build-push-action@v5 - Add GitHub Actions cache (type=gha) for faster subsequent builds - Use matrix strategy for parallel builds of PHP versions and services - Implement proper registry authentication with docker/login-action@v3 - Remove unnecessary metadata action for simpler direct tagging - Maintain conditional push logic (only on non-PR events) - Preserve Zabbix webhook trigger functionality Expected 50-80% build time reduction through layer caching and parallelization.
1 parent 93bb747 commit 7a35127

File tree

2 files changed

+56
-90
lines changed

2 files changed

+56
-90
lines changed

‎.github/workflows/ci-build-php.yml

Lines changed: 24 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -12,54 +12,34 @@ jobs:
1212
name: Build PHP Docker images
1313
runs-on: ubuntu-latest
1414

15+
strategy:
16+
matrix:
17+
php-version: ['8.1', '8.2', '8.3']
18+
1519
steps:
1620
- uses: actions/checkout@v4
1721

18-
- name: set up QEMU
22+
- name: Set up QEMU
1923
uses: docker/setup-qemu-action@v3
2024

21-
- name: set up Docker Buildx
22-
id: buildx
25+
- name: Set up Docker Buildx
2326
uses: docker/setup-buildx-action@v3
2427

25-
- name: available platforms
26-
run: echo ${{ steps.buildx.outputs.platforms }}
27-
28-
- name: build PHP 8.1 image for ghcr.io
29-
working-directory: config/php
30-
if: ${{ github.ref == 'refs/heads/master' }}
31-
env:
32-
GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33-
USERNAME: ${{ github.actor }}
34-
run: |
35-
echo ${GITHUB_PACKAGE_TOKEN} | docker login ghcr.io -u ${USERNAME} --password-stdin
36-
docker buildx build --push \
37-
--platform linux/amd64,linux/arm64 \
38-
-f Dockerfile.8.1 \
39-
-t ghcr.io/paskal/bitrix-php:8.1 .
40-
41-
- name: build PHP 8.2 image for ghcr.io
42-
working-directory: config/php
43-
if: ${{ github.ref == 'refs/heads/master' }}
44-
env:
45-
GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46-
USERNAME: ${{ github.actor }}
47-
run: |
48-
echo ${GITHUB_PACKAGE_TOKEN} | docker login ghcr.io -u ${USERNAME} --password-stdin
49-
docker buildx build --push \
50-
--platform linux/amd64,linux/arm64 \
51-
-f Dockerfile.8.2 \
52-
-t ghcr.io/paskal/bitrix-php:8.2 .
53-
54-
- name: build PHP 8.3 image for ghcr.io
55-
working-directory: config/php
56-
if: ${{ github.ref == 'refs/heads/master' }}
57-
env:
58-
GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59-
USERNAME: ${{ github.actor }}
60-
run: |
61-
echo ${GITHUB_PACKAGE_TOKEN} | docker login ghcr.io -u ${USERNAME} --password-stdin
62-
docker buildx build --push \
63-
--platform linux/amd64,linux/arm64 \
64-
-f Dockerfile.8.3 \
65-
-t ghcr.io/paskal/bitrix-php:8.3 .
28+
- name: Log in to GitHub Container Registry
29+
if: github.event_name != 'pull_request'
30+
uses: docker/login-action@v3
31+
with:
32+
registry: ghcr.io
33+
username: ${{ github.actor }}
34+
password: ${{ secrets.GITHUB_TOKEN }}
35+
36+
- name: Build and push PHP ${{ matrix.php-version }} image
37+
uses: docker/build-push-action@v5
38+
with:
39+
context: config/php
40+
file: config/php/Dockerfile.${{ matrix.php-version }}
41+
platforms: linux/amd64,linux/arm64
42+
push: ${{ github.event_name != 'pull_request' }}
43+
tags: ghcr.io/paskal/bitrix-php:${{ matrix.php-version }}
44+
cache-from: type=gha
45+
cache-to: type=gha,mode=max

‎.github/workflows/ci-build.yml

Lines changed: 32 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,45 @@ jobs:
1212
name: Build Docker images for nginx and Zabbix
1313
runs-on: ubuntu-latest
1414

15+
strategy:
16+
matrix:
17+
include:
18+
- image: nginx
19+
context: config/nginx
20+
registry-image: ghcr.io/paskal/nginx
21+
- image: zabbix-agent2
22+
context: config/zabbix
23+
registry-image: ghcr.io/paskal/zabbix-agent2
24+
1525
steps:
1626
- uses: actions/checkout@v4
1727

18-
- name: set up QEMU
28+
- name: Set up QEMU
1929
uses: docker/setup-qemu-action@v3
2030

21-
- name: set up Docker Buildx
22-
id: buildx
31+
- name: Set up Docker Buildx
2332
uses: docker/setup-buildx-action@v3
2433

25-
- name: available platforms
26-
run: echo ${{ steps.buildx.outputs.platforms }}
27-
28-
- name: build nginx image without pushing (only outside master)
29-
working-directory: config/nginx
30-
if: ${{ github.ref != 'refs/heads/master' }}
31-
run: |
32-
docker buildx build \
33-
--platform linux/amd64 .
34-
35-
- name: build Zabbix agent image without pushing (only outside master)
36-
working-directory: config/zabbix
37-
if: ${{ github.ref != 'refs/heads/master' }}
38-
run: |
39-
docker buildx build \
40-
--platform linux/amd64 .
41-
42-
- name: build nginx image for ghcr.io
43-
working-directory: config/nginx
44-
if: ${{ github.ref == 'refs/heads/master' }}
45-
env:
46-
GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47-
USERNAME: ${{ github.actor }}
48-
run: |
49-
echo ${GITHUB_PACKAGE_TOKEN} | docker login ghcr.io -u ${USERNAME} --password-stdin
50-
docker buildx build --push \
51-
--platform linux/amd64,linux/arm64 \
52-
-t ghcr.io/paskal/nginx:latest .
53-
54-
- name: build Zabbix agent image for ghcr.io
55-
working-directory: config/zabbix
56-
if: ${{ github.ref == 'refs/heads/master' }}
57-
env:
58-
GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59-
USERNAME: ${{ github.actor }}
60-
run: |
61-
echo ${GITHUB_PACKAGE_TOKEN} | docker login ghcr.io -u ${USERNAME} --password-stdin
62-
docker buildx build --push \
63-
--platform linux/amd64,linux/arm64 \
64-
-t ghcr.io/paskal/zabbix-agent2:latest .
65-
66-
- name: remote update of zabbix agent after rebuild
67-
if: ${{ github.ref == 'refs/heads/master' }}
34+
- name: Log in to GitHub Container Registry
35+
if: github.event_name != 'pull_request'
36+
uses: docker/login-action@v3
37+
with:
38+
registry: ghcr.io
39+
username: ${{ github.actor }}
40+
password: ${{ secrets.GITHUB_TOKEN }}
41+
42+
- name: Build and push ${{ matrix.image }} image
43+
uses: docker/build-push-action@v5
44+
with:
45+
context: ${{ matrix.context }}
46+
platforms: linux/amd64,linux/arm64
47+
push: ${{ github.event_name != 'pull_request' }}
48+
tags: ${{ matrix.registry-image }}:latest
49+
cache-from: type=gha
50+
cache-to: type=gha,mode=max
51+
52+
- name: Remote update of zabbix agent after rebuild
53+
if: ${{ github.event_name != 'pull_request' && matrix.image == 'zabbix-agent2' }}
6854
env:
6955
UPDATER_KEY: ${{ secrets.UPDATER_KEY }}
7056
run: curl -s https://hooks.favor-group.ru/update/zabbix/${UPDATER_KEY}

0 commit comments

Comments
 (0)