jpeg, remove 7.2 support
Some checks reported errors
continuous-integration/drone/push Build encountered an error

This commit is contained in:
Aleksander Cynarski 2021-10-09 22:03:41 +02:00
parent 6270d0d262
commit 682480a244
Signed by: paramah
GPG Key ID: C4340BA42B9C173A
3 changed files with 23 additions and 19 deletions

View File

@ -12,7 +12,7 @@ steps:
repo: repo:
from_secret: hub_repo from_secret: hub_repo
build_args: build_args:
- PHP_VERSION=8.0-fpm-alpine3.13 - PHP_VERSION=8-fpm-alpine3.13
tags: 8.0-alpine tags: 8.0-alpine
when: when:
branch: branch:
@ -107,19 +107,19 @@ steps:
# - master # - master
# depends_on: [ clone ] # depends_on: [ clone ]
- name: php7.2 # - name: php7.2
image: plugins/docker # image: plugins/docker
settings: # settings:
username: # username:
from_secret: hub_username # from_secret: hub_username
password: # password:
from_secret: hub_password # from_secret: hub_password
repo: # repo:
from_secret: hub_repo # from_secret: hub_repo
build_args: # build_args:
- PHP_VERSION=7.2-fpm-alpine3.12 # - PHP_VERSION=7.2-fpm-alpine3.12
tags: 7.2-alpine # tags: 7.2-alpine
when: # when:
branch: # branch:
- master # - master
depends_on: [ clone ] # depends_on: [ clone ]

View File

@ -27,7 +27,11 @@ h1 "Configure PHP modules"
case $PHP_VERSION in case $PHP_VERSION in
'80' ) '80' )
h2 "Configure GD" h2 "Configure GD"
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp docker-php-ext-configure gd \
--with-freetype-dir=/usr/lib/ \
--with-png-dir=/usr/lib/ \
--with-jpeg-dir=/usr/lib/ \
--with-gd
;; ;;
'74' ) '74' )
h2 "Configure GD" h2 "Configure GD"

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
if [ -f /var/www/override.ini ]; then if [ -f /var/www/override.ini && -f /usr/local/etc/php/conf.d/02-project-override.ini ]; then
ln -s /var/www/override.ini /usr/local/etc/php/conf.d/02-project-override.ini ln -s /var/www/override.ini /usr/local/etc/php/conf.d/02-project-override.ini
fi fi