Skip to content

Commit 799d10e

Browse files
mistralozmistraloz
committed
Hotfix push patched
1 parent 28d47ee commit 799d10e

File tree

3 files changed

+117
-31
lines changed

3 files changed

+117
-31
lines changed

‎.github/workflows/workflow.yml

+26-12
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
build_test_maybe_release:
1515
strategy:
1616
matrix:
17-
variant: ['cli','apache','fpm']
1817
php_version: ['8.1','8.0','7.4', '7.3','7.2']
18+
variant: ['apache','cli','fpm']
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Set up QEMU
@@ -24,13 +24,23 @@ jobs:
2424
uses: docker/setup-buildx-action@v1
2525
- name: Checkout
2626
uses: actions/checkout@v1
27-
- name: Build locally
28-
run: |
29-
PHP_VERSION="${{ matrix.php_version }}"
30-
docker buildx bake --load \
31-
--set "*.platform=linux/amd64" \
32-
php${PHP_VERSION//.}-${{ matrix.variant }}
33-
docker images --filter=reference=thecodingmachine/php
27+
# - name: Build locally
28+
# run: |
29+
# PHP_VERSION="${{ matrix.php_version }}"
30+
# docker buildx bake --load \
31+
# --set "*.platform=linux/amd64" \
32+
# php${PHP_VERSION//.}-slim-${{ matrix.variant }}
33+
# docker buildx bake --load \
34+
# --set "*.platform=linux/amd64" \
35+
# php${PHP_VERSION//.}-${{ matrix.variant }}-all
36+
# PHP_VERSION_MINOR=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-cli php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
37+
# echo "PHP_VERSION_MINOR=${PHP_VERSION_MINOR}" >> $GITHUB_ENV
38+
# echo "PHP Version : ${PHP_VERSION_MINOR}" >> $GITHUB_STEP_SUMMARY
39+
# docker images --filter=reference=thecodingmachine/php >> $GITHUB_STEP_SUMMARY
40+
# - name: Test ${{ matrix.variant }}
41+
# run: |
42+
# PHP_VERSION="${{ matrix.php_version }}" BRANCH=v4 VARIANT=${{ matrix.variant }} ./test-image.sh
43+
# echo "${{ matrix.variant }} variant OK" >> $GITHUB_STEP_SUMMARY
3444
- name: Login to DockerHub
3545
# Merge ~ push.
3646
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
@@ -42,10 +52,14 @@ jobs:
4252
# Merge ~ push.
4353
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
4454
run: |
45-
PHP_VERSION="${{ matrix.php_version }}" \
46-
PHP_PATCH_VERSION=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-${{ matrix.variant }} php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1` \
47-
PHP_PATCH_MINOR="${PHP_PATCH_VERSION}" \
55+
PHP_VERSION="${{ matrix.php_version }}"
56+
docker buildx bake \
57+
--set "*.platform=linux/amd64,linux/arm64" \
58+
--set "*.output=type=registry" \
59+
php${PHP_VERSION//.}-slim-${{ matrix.variant }}
60+
PHP_PATCH_MINOR=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-cli php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1` \
4861
docker buildx bake \
4962
--set "*.platform=linux/amd64,linux/arm64" \
5063
--set "*.output=type=registry" \
51-
php${PHP_VERSION//.}-${{ matrix.variant }}
64+
php${PHP_VERSION//.}-${{ matrix.variant }}-all
65+
docker images --filter=reference=thecodingmachine/php >> $GITHUB_STEP_SUMMARY

‎docker-bake.hcl

+82-15
Original file line numberDiff line numberDiff line change
@@ -11,62 +11,129 @@ group "default" {
1111
]
1212
}
1313

14-
group "php81" {
14+
group "php81-apache-all" {
1515
targets = [
1616
"php81-slim-apache",
1717
"php81-apache",
18-
"php81-apache-node16","php81-apache-node14","php81-apache-node12","php81-apache-node10","php81-slim-fpm",
18+
"php81-apache-node16","php81-apache-node14","php81-apache-node12","php81-apache-node10",
19+
]
20+
}
21+
group "php81-fpm-all" {
22+
targets = [
23+
"php81-slim-fpm",
1924
"php81-fpm",
20-
"php81-fpm-node16","php81-fpm-node14","php81-fpm-node12","php81-fpm-node10","php81-slim-cli",
25+
"php81-fpm-node16","php81-fpm-node14","php81-fpm-node12","php81-fpm-node10",
26+
]
27+
}
28+
group "php81-cli-all" {
29+
targets = [
30+
"php81-slim-cli",
2131
"php81-cli",
2232
"php81-cli-node16","php81-cli-node14","php81-cli-node12","php81-cli-node10",
2333
]
2434
}
25-
group "php80" {
35+
group "php80-apache-all" {
2636
targets = [
2737
"php80-slim-apache",
2838
"php80-apache",
29-
"php80-apache-node16","php80-apache-node14","php80-apache-node12","php80-apache-node10","php80-slim-fpm",
39+
"php80-apache-node16","php80-apache-node14","php80-apache-node12","php80-apache-node10",
40+
]
41+
}
42+
group "php80-fpm-all" {
43+
targets = [
44+
"php80-slim-fpm",
3045
"php80-fpm",
31-
"php80-fpm-node16","php80-fpm-node14","php80-fpm-node12","php80-fpm-node10","php80-slim-cli",
46+
"php80-fpm-node16","php80-fpm-node14","php80-fpm-node12","php80-fpm-node10",
47+
]
48+
}
49+
group "php80-cli-all" {
50+
targets = [
51+
"php80-slim-cli",
3252
"php80-cli",
3353
"php80-cli-node16","php80-cli-node14","php80-cli-node12","php80-cli-node10",
3454
]
3555
}
36-
group "php74" {
56+
group "php74-apache-all" {
3757
targets = [
3858
"php74-slim-apache",
3959
"php74-apache",
40-
"php74-apache-node16","php74-apache-node14","php74-apache-node12","php74-apache-node10","php74-slim-fpm",
60+
"php74-apache-node16","php74-apache-node14","php74-apache-node12","php74-apache-node10",
61+
]
62+
}
63+
group "php74-fpm-all" {
64+
targets = [
65+
"php74-slim-fpm",
4166
"php74-fpm",
42-
"php74-fpm-node16","php74-fpm-node14","php74-fpm-node12","php74-fpm-node10","php74-slim-cli",
67+
"php74-fpm-node16","php74-fpm-node14","php74-fpm-node12","php74-fpm-node10",
68+
]
69+
}
70+
group "php74-cli-all" {
71+
targets = [
72+
"php74-slim-cli",
4373
"php74-cli",
4474
"php74-cli-node16","php74-cli-node14","php74-cli-node12","php74-cli-node10",
4575
]
4676
}
47-
group "php73" {
77+
group "php73-apache-all" {
4878
targets = [
4979
"php73-slim-apache",
5080
"php73-apache",
51-
"php73-apache-node16","php73-apache-node14","php73-apache-node12","php73-apache-node10","php73-slim-fpm",
81+
"php73-apache-node16","php73-apache-node14","php73-apache-node12","php73-apache-node10",
82+
]
83+
}
84+
group "php73-fpm-all" {
85+
targets = [
86+
"php73-slim-fpm",
5287
"php73-fpm",
53-
"php73-fpm-node16","php73-fpm-node14","php73-fpm-node12","php73-fpm-node10","php73-slim-cli",
88+
"php73-fpm-node16","php73-fpm-node14","php73-fpm-node12","php73-fpm-node10",
89+
]
90+
}
91+
group "php73-cli-all" {
92+
targets = [
93+
"php73-slim-cli",
5494
"php73-cli",
5595
"php73-cli-node16","php73-cli-node14","php73-cli-node12","php73-cli-node10",
5696
]
5797
}
58-
group "php72" {
98+
group "php72-apache-all" {
5999
targets = [
60100
"php72-slim-apache",
61101
"php72-apache",
62-
"php72-apache-node16","php72-apache-node14","php72-apache-node12","php72-apache-node10","php72-slim-fpm",
102+
"php72-apache-node16","php72-apache-node14","php72-apache-node12","php72-apache-node10",
103+
]
104+
}
105+
group "php72-fpm-all" {
106+
targets = [
107+
"php72-slim-fpm",
63108
"php72-fpm",
64-
"php72-fpm-node16","php72-fpm-node14","php72-fpm-node12","php72-fpm-node10","php72-slim-cli",
109+
"php72-fpm-node16","php72-fpm-node14","php72-fpm-node12","php72-fpm-node10",
110+
]
111+
}
112+
group "php72-cli-all" {
113+
targets = [
114+
"php72-slim-cli",
65115
"php72-cli",
66116
"php72-cli-node16","php72-cli-node14","php72-cli-node12","php72-cli-node10",
67117
]
68118
}
69119

120+
121+
group "php81" {
122+
targets = ["php81-apache-all","php81-fpm-all","php81-cli-all",]
123+
}
124+
group "php80" {
125+
targets = ["php80-apache-all","php80-fpm-all","php80-cli-all",]
126+
}
127+
group "php74" {
128+
targets = ["php74-apache-all","php74-fpm-all","php74-cli-all",]
129+
}
130+
group "php73" {
131+
targets = ["php73-apache-all","php73-fpm-all","php73-cli-all",]
132+
}
133+
group "php72" {
134+
targets = ["php72-apache-all","php72-fpm-all","php72-cli-all",]
135+
}
136+
70137
variable "REPO" {default = "thecodingmachine/php"}
71138
variable "PHP_PATCH_MINOR" {default = ""}
72139
variable "GLOBAL_VERSION" {default = "v4"}

‎utils/docker-bake.blueprint.hcl

+9-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@ group "default" {
55
"php{{ $phpV | replace "." "" }}",{{end}}
66
]
77
}
8-
{{range $phpV := $versions}}
9-
group "php{{ $phpV | replace "." "" }}" {
8+
{{range $phpV := $versions}}{{range $variant := $variants}}
9+
group "php{{ $phpV | replace "." "" }}-{{ $variant }}-all" {
1010
targets = [
11-
{{range $variant := $variants}}"php{{ $phpV | replace "." "" }}-slim-{{ $variant }}",
11+
"php{{ $phpV | replace "." "" }}-slim-{{ $variant }}",
1212
"php{{ $phpV | replace "." "" }}-{{ $variant }}",
13-
{{range $nodeV := $nodeVersions}}"php{{ $phpV | replace "." "" }}-{{ $variant }}-node{{ $nodeV }}",{{end}}{{end}}
13+
{{range $nodeV := $nodeVersions}}"php{{ $phpV | replace "." "" }}-{{ $variant }}-node{{ $nodeV }}",{{end}}
1414
]
15+
}{{end}}{{end}}
16+
17+
{{range $phpV := $versions}}
18+
group "php{{ $phpV | replace "." "" }}" {
19+
targets = [{{range $variant := $variants}}"php{{ $phpV | replace "." "" }}-{{ $variant }}-all",{{end}}]
1520
}{{end}}
1621

1722
variable "REPO" {default = "thecodingmachine/php"}

0 commit comments

Comments
 (0)