Skip to content

Commit bf705f0

Browse files
committed
Merge branch 'master' into supervisord
2 parents e99f246 + eed984f commit bf705f0

Some content is hidden

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

57 files changed

+105
-927
lines changed

.github/workflows/ci-cd.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
version: ['8.0', '8.1', '8.2', '8.3', '8.4']
15+
version: ['8.1', '8.2', '8.3', '8.4']
1616
type: ['', '-prod']
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v4.2.2
20+
uses: actions/checkout@v5.0.0
2121

2222
- name: Setup QEMU
2323
uses: docker/setup-qemu-action@v3
@@ -89,6 +89,8 @@ jobs:
8989
docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -v
9090
docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} composer -V
9191
docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} composer1 -V
92+
docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} dockerize --version
93+
9294
docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -m | grep readline
9395
docker run -e ENABLE_XDEBUG=true kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -m
9496

.github/workflows/docker-description.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
docker-description:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4.2.2
15+
- uses: actions/checkout@v5.0.0
1616

1717
- name: Sync Docker Hub Description
18-
uses: peter-evans/dockerhub-description@v4.0.0
18+
uses: peter-evans/dockerhub-description@v5.0.0
1919
env:
2020
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
2121
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

8.0-nginx-prod/Dockerfile

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

8.0-nginx-prod/default.tmpl

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

8.0-nginx-prod/entrypoint

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

8.0-nginx-prod/supervisor.conf

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

8.0-nginx/Dockerfile

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

8.0-nginx/default.tmpl

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

8.0-nginx/entrypoint

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

8.0-nginx/supervisor.conf

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

0 commit comments

Comments
 (0)