Skip to content

Commit f485b3a

Browse files
limingxinleolimingxinleo
committed
Added spec
1 parent 34860dd commit f485b3a

File tree

8 files changed

+30
-25
lines changed

8 files changed

+30
-25
lines changed

β€Ž.github/workflows/build-dev.ymlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
os: [ ubuntu-latest ]
1717
php-version: [ '8.1', '8.2', '8.3' ]
18-
alpine-version: [ '3.16', '3.17', '3.18', 'edge' ]
18+
alpine-version: [ '3.16', '3.17', '3.18', '3.19', 'edge' ]
1919
exclude:
2020
- php-version: '8.3'
2121
alpine-version: '3.16'

β€Ž.github/workflows/build-swoole.ymlβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ env:
99
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
1010
jobs:
1111
build:
12-
name: Build PHP ${{ matrix.php-version }} Alpine ${{ matrix.alpine-version }}
12+
name: Build PHP ${{ matrix.php-version }} Alpine ${{ matrix.alpine-version }} ${{ matrix.spec }}
1313
runs-on: '${{ matrix.os }}'
1414
env:
1515
ALPINE_VERSION: '${{ matrix.alpine-version }}'
1616
PHP_VERSION: '${{ matrix.php-version }}'
17+
SPEC: '${{ matrix.spec }}'
1718
strategy:
1819
matrix:
1920
os: [ ubuntu-latest ]
21+
spec: [ "", "-slim" ]
2022
php-version: [ '8.1', '8.2', '8.3' ]
21-
alpine-version: [ '3.16', '3.17', '3.18', 'edge' ]
23+
alpine-version: [ '3.16', '3.17', '3.18', '3.19', 'edge' ]
2224
exclude:
2325
- php-version: '8.3'
2426
alpine-version: '3.16'
@@ -55,7 +57,7 @@ jobs:
5557
if: ${{ github.ref == 'refs/heads/build' }}
5658
run: ./.github/workflows/push.sh
5759
- name: Push the latest images
58-
if: ${{ github.ref == 'refs/heads/build' && matrix.php-version == '8.2' && matrix.alpine-version == '3.18' }}
60+
if: ${{ github.ref == 'refs/heads/build' && matrix.php-version == '8.2' && matrix.alpine-version == '3.18' && matrix.spec == '' }}
5961
run: |
6062
docker push hyperf/hyperf:latest
6163
docker push ghcr.io/hyperf/hyperf-docker/hyperf:latest

β€Ž.github/workflows/build-swow.ymlβ€Ž

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ env:
99
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
1010
jobs:
1111
build:
12-
name: Build PHP ${{ matrix.php-version }} Alpine ${{ matrix.alpine-version }}
12+
name: Build PHP ${{ matrix.php-version }} Alpine ${{ matrix.alpine-version }} ${{ matrix.spec }}
1313
runs-on: '${{ matrix.os }}'
1414
env:
1515
ALPINE_VERSION: '${{ matrix.alpine-version }}'
1616
PHP_VERSION: '${{ matrix.php-version }}'
17+
SPEC: '${{ matrix.spec }}'
1718
strategy:
1819
matrix:
1920
os: [ ubuntu-latest ]
21+
spec: [ "" ]
2022
php-version: [ '8.1', '8.2', '8.3' ]
21-
alpine-version: [ '3.16', '3.17', '3.18', 'edge' ]
23+
alpine-version: [ '3.16', '3.17', '3.18', '3.19', 'edge' ]
2224
exclude:
2325
- php-version: '8.3'
2426
alpine-version: '3.16'

β€Ž.github/workflows/push.shβ€Ž

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ docker login --username limingxinleo -p $DOCKERHUB_TOKEN
55
docker login ghcr.io --username limingxinleo -p $GITHUB_TOKEN
66

77
# Push to DockerHub
8-
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION} hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION%\.*}
9-
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION} hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION%%\.*}
10-
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION} hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}
11-
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION} hyperf/hyperf:latest
8+
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION} hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION%\.*}
9+
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION} hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION%%\.*}
10+
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION} hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}
11+
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION} hyperf/hyperf:latest
1212

13-
docker push hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION}
14-
docker push hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION%\.*}
15-
docker push hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION%%\.*}
16-
docker push hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}
13+
docker push hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION}
14+
docker push hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION%\.*}
15+
docker push hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION%%\.*}
16+
docker push hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}
1717

1818
# Push to Github
19-
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION} ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION}
20-
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION} ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION%\.*}
21-
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION} ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION%%\.*}
22-
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION} ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}
23-
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION} ghcr.io/hyperf/hyperf-docker/hyperf:latest
19+
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION} ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION}
20+
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION} ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION%\.*}
21+
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION} ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION%%\.*}
22+
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION} ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}
23+
docker tag hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION} ghcr.io/hyperf/hyperf-docker/hyperf:latest
2424

25-
docker push ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION}
26-
docker push ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION%\.*}
27-
docker push ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}-${SW_VERSION%%\.*}
28-
docker push ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}
25+
docker push ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION}
26+
docker push ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION%\.*}
27+
docker push ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}-${SW_VERSION%%\.*}
28+
docker push ghcr.io/hyperf/hyperf-docker/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-${ENGINE}${SPEC}

β€Ž8.1/alpine/swoole/slim.Dockerfileβ€Ž renamed to β€Ž8.1/alpine/swoole/Dockerfile-slimβ€Ž

File renamed without changes.

β€Ž8.2/alpine/swoole/slim.Dockerfileβ€Ž renamed to β€Ž8.2/alpine/swoole/Dockerfile-slimβ€Ž

File renamed without changes.

β€Ž8.3/alpine/swoole/slim.Dockerfileβ€Ž renamed to β€Ž8.3/alpine/swoole/Dockerfile-slimβ€Ž

File renamed without changes.

β€Ždocker-compose.ymlβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ services:
1313

1414
# swoole image
1515
alpine-swoole:
16-
image: "hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-swoole-${SW_VERSION}"
16+
image: "hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-swoole${SPEC}-${SW_VERSION}"
1717
build:
1818
context: "${PHP_VERSION}/alpine/swoole"
19+
dockerfile: "Dockerfile${SPEC}"
1920
args:
2021
ALPINE_VERSION: ${ALPINE_VERSION}
2122
SW_VERSION: ${SW_VERSION}
@@ -24,7 +25,7 @@ services:
2425

2526
# swow image
2627
alpine-swow:
27-
image: "hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-swow-${SW_VERSION}"
28+
image: "hyperf/hyperf:${PHP_VERSION}-alpine-v${ALPINE_VERSION}-swow${SPEC}-${SW_VERSION}"
2829
build:
2930
context: "${PHP_VERSION}/alpine/swow"
3031
args:

0 commit comments

Comments
Β (0)