Skip to content

Commit fa47f0e

Browse files
fabriciojsfabriciojs
authored
Merge pull request #16 from kool-dev/php8
Adding PHP8 Support + Dropping wkhtmltopdf images support
2 parents a326293 + 5611f1b commit fa47f0e

46 files changed

Lines changed: 754 additions & 747 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/ci-cd.yml‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
version: [7.1, 7.2, 7.3, 7.4]
14+
version: ['7.1', '7.2', '7.3', '7.4', '8.0']
1515
type: ['', '-prod']
1616

1717
steps:
@@ -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-prod/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ RUN adduser -D -u 1337 kool \
3636
--with-png-dir=/usr/include/ \
3737
--with-jpeg-dir=/usr/include/ \
3838
&& export CFLAGS="$PHP_CFLAGS" CPPFLAGS="$PHP_CPPFLAGS" LDFLAGS="$PHP_LDFLAGS" \
39-
&& pecl install imagick-3.4.4 redis \
40-
&& docker-php-ext-enable imagick redis \
4139
&& docker-php-ext-install -j$(nproc) \
4240
bcmath \
4341
calendar \
@@ -54,14 +52,18 @@ RUN adduser -D -u 1337 kool \
5452
soap \
5553
xml \
5654
zip \
55+
&& pecl install imagick \
56+
&& pecl install redis \
57+
&& docker-php-ext-enable imagick \
58+
&& docker-php-ext-enable redis \
5759
&& cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
5860
# composer
5961
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
6062
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
6163
&& su-exec kool composer global require hirak/prestissimo \
6264
# cleanup
6365
&& apk del .build-deps \
64-
&& rm -rf /var/cache/apk/* /tmp/* /home/kool/.composer/cache
66+
&& rm -rf /var/cache/apk/* /tmp/*
6567

6668
COPY kool.ini /kool/kool.tmpl
6769
COPY zz-docker.conf /kool/zz-docker.tmpl

‎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.1/Dockerfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ RUN adduser -D -u 1337 kool \
3737
--with-png-dir=/usr/include/ \
3838
--with-jpeg-dir=/usr/include/ \
3939
&& export CFLAGS="$PHP_CFLAGS" CPPFLAGS="$PHP_CPPFLAGS" LDFLAGS="$PHP_LDFLAGS" \
40-
&& pecl install imagick-3.4.4 redis xdebug \
41-
&& docker-php-ext-enable imagick redis \
4240
&& docker-php-ext-install -j$(nproc) \
4341
bcmath \
4442
calendar \
@@ -54,14 +52,19 @@ RUN adduser -D -u 1337 kool \
5452
soap \
5553
xml \
5654
zip \
55+
&& pecl install imagick \
56+
&& pecl install redis \
57+
&& pecl install xdebug-2.9.8 \
58+
&& docker-php-ext-enable imagick \
59+
&& docker-php-ext-enable redis \
5760
&& cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
5861
# composer
5962
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
6063
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
6164
&& su-exec kool composer global require hirak/prestissimo \
6265
# cleanup
6366
&& apk del .build-deps \
64-
&& rm -rf /var/cache/apk/* /tmp/* /home/kool/.composer/cache
67+
&& rm -rf /var/cache/apk/* /tmp/*
6568

6669
COPY kool.ini /kool/kool.tmpl
6770
COPY zz-docker.conf /kool/zz-docker.tmpl

‎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-prod/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ RUN adduser -D -u 1337 kool \
3636
--with-png-dir=/usr/include/ \
3737
--with-jpeg-dir=/usr/include/ \
3838
&& export CFLAGS="$PHP_CFLAGS" CPPFLAGS="$PHP_CPPFLAGS" LDFLAGS="$PHP_LDFLAGS" \
39-
&& pecl install imagick-3.4.4 redis \
40-
&& docker-php-ext-enable imagick redis \
4139
&& docker-php-ext-install -j$(nproc) \
4240
bcmath \
4341
calendar \
@@ -54,14 +52,18 @@ RUN adduser -D -u 1337 kool \
5452
soap \
5553
xml \
5654
zip \
55+
&& pecl install imagick \
56+
&& pecl install redis \
57+
&& docker-php-ext-enable imagick \
58+
&& docker-php-ext-enable redis \
5759
&& cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
5860
# composer
5961
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
6062
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
6163
&& su-exec kool composer global require hirak/prestissimo \
6264
# cleanup
6365
&& apk del .build-deps \
64-
&& rm -rf /var/cache/apk/* /tmp/* /home/kool/.composer/cache
66+
&& rm -rf /var/cache/apk/* /tmp/*
6567

6668
COPY kool.ini /kool/kool.tmpl
6769
COPY zz-docker.conf /kool/zz-docker.tmpl

0 commit comments

Comments
 (0)