Skip to content

Commit 2d980d9

Browse files
committed
feat: update PHP versions
- Remove 7.4 (EOL) - Update 8.0 to 8.0.27 - Update 8.1 to 8.1.14 - Add PHP 8.2 - Remove alpine3.15 - Add alpine3.17 (except for 8.0)
1 parent 0ff7b12 commit 2d980d9

137 files changed

Lines changed: 502 additions & 885 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/8.0.yml

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: Verify templating
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Generate
2424
run: make all
2525
- name: Check Git status
@@ -35,21 +35,18 @@ jobs:
3535
matrix:
3636
target:
3737
[
38-
"8_0_24-cli-bullseye",
39-
"8_0_24-fpm-bullseye",
40-
"8_0_24-nginx-bullseye",
41-
"8_0_24-cli-buster",
42-
"8_0_24-fpm-buster",
43-
"8_0_24-nginx-buster",
44-
"8_0_24-cli-alpine3_16",
45-
"8_0_24-fpm-alpine3_16",
46-
"8_0_24-nginx-alpine3_16",
47-
"8_0_24-cli-alpine3_15",
48-
"8_0_24-fpm-alpine3_15",
49-
"8_0_24-nginx-alpine3_15",
38+
"8_0_27-cli-bullseye",
39+
"8_0_27-fpm-bullseye",
40+
"8_0_27-nginx-bullseye",
41+
"8_0_27-cli-buster",
42+
"8_0_27-fpm-buster",
43+
"8_0_27-nginx-buster",
44+
"8_0_27-cli-alpine3_16",
45+
"8_0_27-fpm-alpine3_16",
46+
"8_0_27-nginx-alpine3_16",
5047
]
5148
env:
52-
DOCKER_HUB_PUSH: ${{ (secrets.DOCKERHUB_USERNAME && secrets.DOCKERHUB_TOKEN) && 'true' || 'false' }}
49+
DOCKER_HUB_PUSH: ${{ (secrets.DOCKER_HUB_USERNAME && secrets.DOCKER_HUB_TOKEN) && 'true' || 'false' }}
5350
steps:
5451
- name: Checkout
5552
uses: actions/checkout@v3
@@ -58,36 +55,34 @@ jobs:
5855
with:
5956
platforms: arm,arm64
6057
- name: Set up buildx
61-
uses: docker/setup-buildx-action@v1
62-
with:
63-
version: v0.7.0
58+
uses: docker/setup-buildx-action@v2
6459
- name: Login to Docker Hub
6560
uses: docker/login-action@v2
6661
with:
67-
username: ${{ secrets.DOCKERHUB_USERNAME }}
68-
password: ${{ secrets.DOCKERHUB_TOKEN }}
62+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
63+
password: ${{ secrets.DOCKER_HUB_TOKEN }}
6964
if: ${{ env.DOCKER_HUB_PUSH == 'true' }}
7065
- name: Login to GitHub Container Registry
7166
uses: docker/login-action@v2
7267
with:
7368
registry: ghcr.io
7469
username: ${{ github.repository_owner }}
7570
password: ${{ secrets.GITHUB_TOKEN }}
76-
- name: Build and push to DockerHub
71+
- name: Build and push to GitHub Container Registry
7772
uses: docker/bake-action@v2
73+
env:
74+
REGISTRY: ghcr.io
75+
REPO: ${{ github.repository_owner }}/php
7876
with:
7977
targets: ${{ matrix.target }}
8078
set: |
8179
*.platform=linux/amd64,linux/arm,linux/arm64
8280
push: ${{ github.event_name == 'push' }}
83-
if: ${{ env.DOCKER_HUB_PUSH == 'true' }}
84-
- name: Build and push to GitHub Container Registry
81+
- name: Build and push to DockerHub
8582
uses: docker/bake-action@v2
86-
env:
87-
REGISTRY: ghcr.io
88-
REPO: ${{ github.repository_owner }}/php
8983
with:
9084
targets: ${{ matrix.target }}
9185
set: |
9286
*.platform=linux/amd64,linux/arm,linux/arm64
9387
push: ${{ github.event_name == 'push' }}
88+
if: ${{ env.DOCKER_HUB_PUSH == 'true' }}

.github/workflows/8.1.yml

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: Verify templating
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Generate
2424
run: make all
2525
- name: Check Git status
@@ -35,21 +35,21 @@ jobs:
3535
matrix:
3636
target:
3737
[
38-
"8_1_11-cli-bullseye",
39-
"8_1_11-fpm-bullseye",
40-
"8_1_11-nginx-bullseye",
41-
"8_1_11-cli-buster",
42-
"8_1_11-fpm-buster",
43-
"8_1_11-nginx-buster",
44-
"8_1_11-cli-alpine3_16",
45-
"8_1_11-fpm-alpine3_16",
46-
"8_1_11-nginx-alpine3_16",
47-
"8_1_11-cli-alpine3_15",
48-
"8_1_11-fpm-alpine3_15",
49-
"8_1_11-nginx-alpine3_15",
38+
"8_1_14-cli-bullseye",
39+
"8_1_14-fpm-bullseye",
40+
"8_1_14-nginx-bullseye",
41+
"8_1_14-cli-buster",
42+
"8_1_14-fpm-buster",
43+
"8_1_14-nginx-buster",
44+
"8_1_14-cli-alpine3_17",
45+
"8_1_14-fpm-alpine3_17",
46+
"8_1_14-nginx-alpine3_17",
47+
"8_1_14-cli-alpine3_16",
48+
"8_1_14-fpm-alpine3_16",
49+
"8_1_14-nginx-alpine3_16",
5050
]
5151
env:
52-
DOCKER_HUB_PUSH: ${{ (secrets.DOCKERHUB_USERNAME && secrets.DOCKERHUB_TOKEN) && 'true' || 'false' }}
52+
DOCKER_HUB_PUSH: ${{ (secrets.DOCKER_HUB_USERNAME && secrets.DOCKER_HUB_TOKEN) && 'true' || 'false' }}
5353
steps:
5454
- name: Checkout
5555
uses: actions/checkout@v3
@@ -58,36 +58,34 @@ jobs:
5858
with:
5959
platforms: arm,arm64
6060
- name: Set up buildx
61-
uses: docker/setup-buildx-action@v1
62-
with:
63-
version: v0.7.0
61+
uses: docker/setup-buildx-action@v2
6462
- name: Login to Docker Hub
6563
uses: docker/login-action@v2
6664
with:
67-
username: ${{ secrets.DOCKERHUB_USERNAME }}
68-
password: ${{ secrets.DOCKERHUB_TOKEN }}
65+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
66+
password: ${{ secrets.DOCKER_HUB_TOKEN }}
6967
if: ${{ env.DOCKER_HUB_PUSH == 'true' }}
7068
- name: Login to GitHub Container Registry
7169
uses: docker/login-action@v2
7270
with:
7371
registry: ghcr.io
7472
username: ${{ github.repository_owner }}
7573
password: ${{ secrets.GITHUB_TOKEN }}
76-
- name: Build and push to DockerHub
74+
- name: Build and push to GitHub Container Registry
7775
uses: docker/bake-action@v2
76+
env:
77+
REGISTRY: ghcr.io
78+
REPO: ${{ github.repository_owner }}/php
7879
with:
7980
targets: ${{ matrix.target }}
8081
set: |
8182
*.platform=linux/amd64,linux/arm,linux/arm64
8283
push: ${{ github.event_name == 'push' }}
83-
if: ${{ env.DOCKER_HUB_PUSH == 'true' }}
84-
- name: Build and push to GitHub Container Registry
84+
- name: Build and push to DockerHub
8585
uses: docker/bake-action@v2
86-
env:
87-
REGISTRY: ghcr.io
88-
REPO: ${{ github.repository_owner }}/php
8986
with:
9087
targets: ${{ matrix.target }}
9188
set: |
9289
*.platform=linux/amd64,linux/arm,linux/arm64
9390
push: ${{ github.event_name == 'push' }}
91+
if: ${{ env.DOCKER_HUB_PUSH == 'true' }}
Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# NOTE: This file was generated via generate.sh. Don't edit it directly
22

3-
name: 'PHP 7.4'
3+
name: 'PHP 8.2'
44

55
on:
66
pull_request:
77
paths:
8-
- 7.4/**
8+
- 8.2/**
99
push:
1010
paths:
11-
- 7.4/**
11+
- 8.2/**
1212

1313
defaults:
1414
run:
@@ -19,7 +19,7 @@ jobs:
1919
name: Verify templating
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Generate
2424
run: make all
2525
- name: Check Git status
@@ -35,21 +35,21 @@ jobs:
3535
matrix:
3636
target:
3737
[
38-
"7_4_32-cli-bullseye",
39-
"7_4_32-fpm-bullseye",
40-
"7_4_32-nginx-bullseye",
41-
"7_4_32-cli-buster",
42-
"7_4_32-fpm-buster",
43-
"7_4_32-nginx-buster",
44-
"7_4_32-cli-alpine3_16",
45-
"7_4_32-fpm-alpine3_16",
46-
"7_4_32-nginx-alpine3_16",
47-
"7_4_32-cli-alpine3_15",
48-
"7_4_32-fpm-alpine3_15",
49-
"7_4_32-nginx-alpine3_15",
38+
"8_2_1-cli-bullseye",
39+
"8_2_1-fpm-bullseye",
40+
"8_2_1-nginx-bullseye",
41+
"8_2_1-cli-buster",
42+
"8_2_1-fpm-buster",
43+
"8_2_1-nginx-buster",
44+
"8_2_1-cli-alpine3_17",
45+
"8_2_1-fpm-alpine3_17",
46+
"8_2_1-nginx-alpine3_17",
47+
"8_2_1-cli-alpine3_16",
48+
"8_2_1-fpm-alpine3_16",
49+
"8_2_1-nginx-alpine3_16",
5050
]
5151
env:
52-
DOCKER_HUB_PUSH: ${{ (secrets.DOCKERHUB_USERNAME && secrets.DOCKERHUB_TOKEN) && 'true' || 'false' }}
52+
DOCKER_HUB_PUSH: ${{ (secrets.DOCKER_HUB_USERNAME && secrets.DOCKER_HUB_TOKEN) && 'true' || 'false' }}
5353
steps:
5454
- name: Checkout
5555
uses: actions/checkout@v3
@@ -58,36 +58,34 @@ jobs:
5858
with:
5959
platforms: arm,arm64
6060
- name: Set up buildx
61-
uses: docker/setup-buildx-action@v1
62-
with:
63-
version: v0.7.0
61+
uses: docker/setup-buildx-action@v2
6462
- name: Login to Docker Hub
6563
uses: docker/login-action@v2
6664
with:
67-
username: ${{ secrets.DOCKERHUB_USERNAME }}
68-
password: ${{ secrets.DOCKERHUB_TOKEN }}
65+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
66+
password: ${{ secrets.DOCKER_HUB_TOKEN }}
6967
if: ${{ env.DOCKER_HUB_PUSH == 'true' }}
7068
- name: Login to GitHub Container Registry
7169
uses: docker/login-action@v2
7270
with:
7371
registry: ghcr.io
7472
username: ${{ github.repository_owner }}
7573
password: ${{ secrets.GITHUB_TOKEN }}
76-
- name: Build and push to DockerHub
74+
- name: Build and push to GitHub Container Registry
7775
uses: docker/bake-action@v2
76+
env:
77+
REGISTRY: ghcr.io
78+
REPO: ${{ github.repository_owner }}/php
7879
with:
7980
targets: ${{ matrix.target }}
8081
set: |
8182
*.platform=linux/amd64,linux/arm,linux/arm64
8283
push: ${{ github.event_name == 'push' }}
83-
if: ${{ env.DOCKER_HUB_PUSH == 'true' }}
84-
- name: Build and push to GitHub Container Registry
84+
- name: Build and push to DockerHub
8585
uses: docker/bake-action@v2
86-
env:
87-
REGISTRY: ghcr.io
88-
REPO: ${{ github.repository_owner }}/php
8986
with:
9087
targets: ${{ matrix.target }}
9188
set: |
9289
*.platform=linux/amd64,linux/arm,linux/arm64
9390
push: ${{ github.event_name == 'push' }}
91+
if: ${{ env.DOCKER_HUB_PUSH == 'true' }}

7.4/alpine3.15/nginx/Dockerfile

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)