diff --git a/.drone.yml b/.drone.yml index 321eca5..c8345f6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: repo: from_secret: hub_repo build_args: - - PHP_VERSION=8.0-fpm-alpine3.13 + - PHP_VERSION=8-fpm-alpine3.13 tags: 8.0-alpine when: branch: @@ -107,19 +107,19 @@ steps: # - master # depends_on: [ clone ] -- name: php7.2 - image: plugins/docker - settings: - username: - from_secret: hub_username - password: - from_secret: hub_password - repo: - from_secret: hub_repo - build_args: - - PHP_VERSION=7.2-fpm-alpine3.12 - tags: 7.2-alpine - when: - branch: - - master - depends_on: [ clone ] +# - name: php7.2 +# image: plugins/docker +# settings: +# username: +# from_secret: hub_username +# password: +# from_secret: hub_password +# repo: +# from_secret: hub_repo +# build_args: +# - PHP_VERSION=7.2-fpm-alpine3.12 +# tags: 7.2-alpine +# when: +# branch: +# - master +# depends_on: [ clone ] diff --git a/docker/usr/local/bin/php_configure.sh b/docker/usr/local/bin/php_configure.sh index 8e47038..35617ba 100755 --- a/docker/usr/local/bin/php_configure.sh +++ b/docker/usr/local/bin/php_configure.sh @@ -27,7 +27,11 @@ h1 "Configure PHP modules" case $PHP_VERSION in '80' ) 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' ) h2 "Configure GD" diff --git a/docker/usr/local/bin/project_setup b/docker/usr/local/bin/project_setup index 77faafa..826d69e 100755 --- a/docker/usr/local/bin/project_setup +++ b/docker/usr/local/bin/project_setup @@ -1,5 +1,5 @@ #!/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 fi