Skip to content

Commit c7a762d

Browse files
committed
remove wkhtmltopdf version in favour of kool-dev/pdf
1 parent 9614c01 commit c7a762d

25 files changed

Lines changed: 3 additions & 910 deletions

File tree

.github/workflows/ci-cd.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,15 @@ jobs:
2424
--tag kooldev/php:${{ matrix.version }}${{ matrix.type }} \
2525
${{ matrix.version }}${{ matrix.type }}
2626
27-
docker build \
28-
--tag kooldev/php:${{ matrix.version }}-wkhtmltopdf${{ matrix.type }} \
29-
${{ matrix.version }}-wkhtmltopdf${{ matrix.type }}
30-
3127
- name: Build (nginx)
3228
run: |
3329
docker build \
3430
--tag kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} \
3531
${{ matrix.version }}-nginx${{ matrix.type }}
3632
37-
docker build \
38-
--tag kooldev/php:${{ matrix.version }}-nginx-wkhtmltopdf${{ matrix.type }} \
39-
${{ matrix.version }}-nginx-wkhtmltopdf${{ matrix.type }}
40-
4133
- name: Tests
4234
run: |
43-
for suffix in '' -wkhtmltopdf -nginx -nginx-wkhtmltopdf; do
35+
for suffix in '' -nginx; do
4436
docker run kooldev/php:${{ matrix.version }}$suffix${{ matrix.type }} php -v
4537
docker run kooldev/php:${{ matrix.version }}$suffix${{ matrix.type }} composer -V
4638
docker run kooldev/php:${{ matrix.version }}$suffix${{ matrix.type }} composer2 -V
@@ -51,10 +43,8 @@ jobs:
5143
docker run -e ENABLE_XDEBUG=true kooldev/php:${{ matrix.version }}$suffix${{ matrix.type }} php -m
5244
done
5345
54-
for suffix in -nginx -nginx-wkhtmltopdf; do
55-
docker run kooldev/php:${{ matrix.version }}$suffix${{ matrix.type }} nginx -v
56-
docker run kooldev/php:${{ matrix.version }}$suffix${{ matrix.type }} supervisord version
57-
done
46+
docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} nginx -v
47+
docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} supervisord version
5848
5949
- name: Login to DockerHub
6050
uses: docker/login-action@v1
@@ -67,10 +57,7 @@ jobs:
6757
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-php'
6858
run: |
6959
docker push kooldev/php:${{ matrix.version }}${{ matrix.type }}
70-
docker push kooldev/php:${{ matrix.version }}-wkhtmltopdf${{ matrix.type }}
71-
7260
docker push kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }}
73-
docker push kooldev/php:${{ matrix.version }}-nginx-wkhtmltopdf${{ matrix.type }}
7461
7562
trigger-wordpress:
7663
name: Trigger docker-wordpress

7.1-nginx-wkhtmltopdf-prod/Dockerfile

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

7.1-nginx-wkhtmltopdf/Dockerfile

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

7.1-wkhtmltopdf-prod/Dockerfile

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

7.1-wkhtmltopdf/Dockerfile

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

7.2-nginx-wkhtmltopdf-prod/Dockerfile

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

7.2-nginx-wkhtmltopdf/Dockerfile

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

7.2-wkhtmltopdf-prod/Dockerfile

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

7.2-wkhtmltopdf/Dockerfile

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

7.3-nginx-wkhtmltopdf-prod/Dockerfile

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

0 commit comments

Comments
 (0)