Skip to content

Commit ce479e8

Browse files
authored
Merge pull request #12 from renoki-co/feature/swoole-4.8-php-8.1
[upgrade] PHP 8.1 and Swoole 4.8 upgrades
2 parents 0f9a34d + 0928879 commit ce479e8

7 files changed

+31
-12
lines changed

.github/workflows/docker-commit.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ jobs:
1717
name: Tag Commit (PHP-FPM, ${{ matrix.base-tag }})
1818

1919
strategy:
20+
fail-fast: false
2021
matrix:
2122
base-tag:
2223
- 7.4-fpm-alpine
2324
- 8.0-fpm-alpine
25+
- 8.1-fpm-alpine
2426

2527
steps:
2628
- uses: actions/checkout@v3
@@ -57,11 +59,15 @@ jobs:
5759
name: Tag Commit (Octane, ${{ matrix.base-tag }})
5860

5961
strategy:
62+
fail-fast: false
6063
matrix:
6164
base-tag:
65+
- 4.8-php8.0-alpine
6266
- 4.7-php8.0-alpine
6367
- 4.6-php8.0-alpine
64-
- 4.5-php8.0-alpine
68+
- 4.8-php8.1-alpine
69+
# - 4.7-php8.1-alpine
70+
# - 4.6-php8.1-alpine
6571

6672
steps:
6773
- uses: actions/checkout@v3
@@ -98,8 +104,10 @@ jobs:
98104
name: Tag Commit (Worker, ${{ matrix.base-tag }})
99105

100106
strategy:
107+
fail-fast: false
101108
matrix:
102109
base-tag:
110+
- 8.1-cli-alpine
103111
- 8.0-cli-alpine
104112
- 7.4-cli-alpine
105113

.github/workflows/docker-latest-tag.yaml

+9-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ jobs:
1414
name: Tag Latest (PHP-FPM, ${{ matrix.base-tag }})
1515

1616
strategy:
17+
fail-fast: false
1718
matrix:
1819
base-tag:
1920
- 7.4-fpm-alpine
2021
- 8.0-fpm-alpine
22+
- 8.1-fpm-alpine
2123

2224
steps:
2325
- uses: actions/checkout@v3
@@ -54,11 +56,15 @@ jobs:
5456
name: Tag Latest (Octane, ${{ matrix.base-tag }})
5557

5658
strategy:
59+
fail-fast: false
5760
matrix:
5861
base-tag:
62+
- 4.8-php8.0-alpine
5963
- 4.7-php8.0-alpine
6064
- 4.6-php8.0-alpine
61-
- 4.5-php8.0-alpine
65+
- 4.8-php8.1-alpine
66+
# - 4.7-php8.1-alpine
67+
# - 4.6-php8.1-alpine
6268

6369
steps:
6470
- uses: actions/checkout@v3
@@ -95,8 +101,10 @@ jobs:
95101
name: Tag Latest (Worker, ${{ matrix.base-tag }})
96102

97103
strategy:
104+
fail-fast: false
98105
matrix:
99106
base-tag:
107+
- 8.1-cli-alpine
100108
- 8.0-cli-alpine
101109
- 7.4-cli-alpine
102110

.github/workflows/docker-release-tag.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ jobs:
1414
name: Tag Release (PHP-FPM, ${{ matrix.base-tag }})
1515

1616
strategy:
17+
fail-fast: false
1718
matrix:
1819
base-tag:
1920
- 7.4-fpm-alpine
2021
- 8.0-fpm-alpine
22+
- 8.1-fpm-alpine
2123

2224
steps:
2325
- uses: actions/checkout@v3
@@ -66,9 +68,12 @@ jobs:
6668
strategy:
6769
matrix:
6870
base-tag:
71+
- 4.8-php8.0-alpine
6972
- 4.7-php8.0-alpine
7073
- 4.6-php8.0-alpine
71-
- 4.5-php8.0-alpine
74+
- 4.8-php8.1-alpine
75+
# - 4.7-php8.1-alpine
76+
# - 4.6-php8.1-alpine
7277

7378
steps:
7479
- uses: actions/checkout@v3
@@ -117,6 +122,7 @@ jobs:
117122
strategy:
118123
matrix:
119124
base-tag:
125+
- 8.1-cli-alpine
120126
- 8.0-cli-alpine
121127
- 7.4-cli-alpine
122128

Dockerfile.fpm

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_TAG=8.0-fpm-alpine
1+
ARG BASE_TAG=8.1-fpm-alpine
22

33
FROM php:$BASE_TAG
44

@@ -35,7 +35,6 @@ RUN apk --update add \
3535
mbstring \
3636
pdo \
3737
pdo_mysql \
38-
tokenizer \
3938
xml \
4039
pcntl \
4140
bcmath \

Dockerfile.octane

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_TAG=4.6-php8.0-alpine
1+
ARG BASE_TAG=4.6-php8.1-alpine
22

33
# https://hub.docker.com/r/phpswoole/swoole
44
FROM phpswoole/swoole:$BASE_TAG
@@ -36,7 +36,6 @@ RUN apk --update add \
3636
mbstring \
3737
pdo \
3838
pdo_mysql \
39-
tokenizer \
4039
xml \
4140
pcntl \
4241
bcmath \

Dockerfile.worker

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_TAG=8.0-cli-alpine
1+
ARG BASE_TAG=8.1-cli-alpine
22

33
FROM php:$BASE_TAG
44

@@ -35,7 +35,6 @@ RUN apk --update add \
3535
mbstring \
3636
pdo \
3737
pdo_mysql \
38-
tokenizer \
3938
xml \
4039
pcntl \
4140
bcmath \

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ These images can be used to compile your app code in a PHP-ready container to be
3636
Octane images are based on [a PHP-Swoole image](https://hub.docker.com/r/phpswoole/swoole) that works directly with Octane in Swoole mode.
3737

3838
```Dockerfile
39-
FROM quay.io/renokico/laravel-base:octane-latest-php8.0-alpine
39+
FROM quay.io/renokico/laravel-base:octane-latest-php8.1-alpine
4040

4141
COPY . /var/www/html
4242

@@ -55,7 +55,7 @@ EXPOSE 80
5555
The PHP-FPM image contains the PHP-FPM process and will be complemented by NGINX in the Helm chart.
5656

5757
```Dockerfile
58-
FROM quay.io/renokico/laravel-base:latest-8.0-fpm-alpine
58+
FROM quay.io/renokico/laravel-base:latest-8.1-fpm-alpine
5959

6060
COPY . /var/www/html
6161

@@ -70,7 +70,7 @@ WORKDIR /var/www/html
7070
Workers can be either long-running processes that serve as workers (for example, queues) or by running a local process that might also expose a HTTP server, etc. Either way, you can use a Worker to extend your project.
7171

7272
```Dockerfile
73-
FROM quay.io/renokico/laravel-base:worker-latest-8.0-cli-alpine
73+
FROM quay.io/renokico/laravel-base:worker-latest-8.1-cli-alpine
7474

7575
COPY . /var/www/html
7676

0 commit comments

Comments
 (0)