new gd compile, fix project_setup override
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Some checks reported errors
continuous-integration/drone/push Build encountered an error
This commit is contained in:
parent
20356998e3
commit
a55353fbc8
GPG Key ID:
C4340BA42B9C173A
96
.drone.yml
96
.drone.yml
@ -37,22 +37,22 @@ steps:
|
||||
# - master
|
||||
# depends_on: [ clone ]
|
||||
|
||||
# - name: php7.4
|
||||
# image: plugins/docker
|
||||
# settings:
|
||||
# username:
|
||||
# from_secret: hub_username
|
||||
# password:
|
||||
# from_secret: hub_password
|
||||
# repo:
|
||||
# from_secret: hub_repo
|
||||
# build_args:
|
||||
# - PHP_VERSION=7.4-fpm-alpine3.13
|
||||
# tags: 7.4-alpine
|
||||
# when:
|
||||
# branch:
|
||||
# - master
|
||||
# depends_on: [ clone ]
|
||||
- name: php7.4
|
||||
image: plugins/docker
|
||||
settings:
|
||||
username:
|
||||
from_secret: hub_username
|
||||
password:
|
||||
from_secret: hub_password
|
||||
repo:
|
||||
from_secret: hub_repo
|
||||
build_args:
|
||||
- PHP_VERSION=7.4-fpm-alpine3.13
|
||||
tags: 7.4-alpine
|
||||
when:
|
||||
branch:
|
||||
- master
|
||||
depends_on: [ clone ]
|
||||
|
||||
# - name: php7.4-dev
|
||||
# image: plugins/docker
|
||||
@ -72,22 +72,22 @@ steps:
|
||||
# - master
|
||||
# depends_on: [ clone ]
|
||||
|
||||
# - name: php7.3
|
||||
# image: plugins/docker
|
||||
# settings:
|
||||
# username:
|
||||
# from_secret: hub_username
|
||||
# password:
|
||||
# from_secret: hub_password
|
||||
# repo:
|
||||
# from_secret: hub_repo
|
||||
# build_args:
|
||||
# - PHP_VERSION=7.3-fpm-alpine3.13
|
||||
# tags: 7.3-alpine
|
||||
# when:
|
||||
# branch:
|
||||
# - master
|
||||
# depends_on: [ clone ]
|
||||
- name: php7.3
|
||||
image: plugins/docker
|
||||
settings:
|
||||
username:
|
||||
from_secret: hub_username
|
||||
password:
|
||||
from_secret: hub_password
|
||||
repo:
|
||||
from_secret: hub_repo
|
||||
build_args:
|
||||
- PHP_VERSION=7.3-fpm-alpine3.13
|
||||
tags: 7.3-alpine
|
||||
when:
|
||||
branch:
|
||||
- master
|
||||
depends_on: [ clone ]
|
||||
|
||||
# - name: php7.3-dev
|
||||
# image: plugins/docker
|
||||
@ -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 ]
|
||||
|
||||
@ -50,7 +50,7 @@ ARG ENVIRONMENT=production
|
||||
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && apk update
|
||||
|
||||
# install system libs
|
||||
RUN apk add --no-cache libintl c-client libpng icu-libs libldap libpq libjpeg freetype libzip shadow sudo wget bash git openssh supervisor nginx openssl zip fluent-bit \
|
||||
RUN apk add --no-cache libintl c-client libpng icu-libs libldap libpq libjpeg libwebp freetype libzip shadow sudo wget bash git openssh supervisor nginx openssl zip fluent-bit \
|
||||
&& apk --no-cache upgrade && rm -rf /var/cache/apk/*
|
||||
|
||||
ENV DIR /var/www
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
PHP_VERSION=`php -r 'echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;'`
|
||||
PHP_MODULES=("calendar" "bcmath" "bz2" "curl" "fileinfo" "gd" "gettext" "iconv" "imap" "intl" "ldap" "mbstring" "opcache" "pcntl" "pdo" "pdo_mysql" "pdo_pgsql" "pdo_sqlite" "pgsql" "phar" "session" "simplexml" "soap" "xml", "zip")
|
||||
PHP_MODULES=("calendar" "bcmath" "bz2" "curl" "fileinfo" "gettext" "iconv" "imap" "intl" "ldap" "mbstring" "opcache" "pcntl" "pdo" "pdo_mysql" "pdo_pgsql" "pdo_sqlite" "pgsql" "phar" "session" "simplexml" "soap" "xml", "zip")
|
||||
|
||||
#
|
||||
# Helper functions
|
||||
@ -26,25 +26,26 @@ h2() {
|
||||
h1 "Configure PHP modules"
|
||||
case $PHP_VERSION in
|
||||
'80' )
|
||||
h2 "[php8] Configure GD"
|
||||
docker-php-ext-configure gd \
|
||||
--with-freetype \
|
||||
--with-jpeg \
|
||||
--with-webp
|
||||
h2 "[php8] Configure and install GD"
|
||||
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --enable-gd
|
||||
docker-php-ext-install -j$(nproc) gd
|
||||
|
||||
;;
|
||||
'74' )
|
||||
h2 "[php74] Configure GD"
|
||||
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp
|
||||
h2 "[php74] Configure and install GD"
|
||||
docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp
|
||||
docker-php-ext-install -j$(nproc) gd
|
||||
h2 "Install json module"
|
||||
docker-php-ext-install -j$(nproc) json
|
||||
;;
|
||||
* )
|
||||
h2 "Configure GD"
|
||||
h2 "Configure and install GD"
|
||||
docker-php-ext-configure gd \
|
||||
--with-freetype-dir=/usr/lib/ \
|
||||
--with-png-dir=/usr/lib/ \
|
||||
--with-jpeg-dir=/usr/lib/ \
|
||||
--with-gd
|
||||
docker-php-ext-install -j$(nproc) gd
|
||||
h2 "Install json module"
|
||||
docker-php-ext-install -j$(nproc) json
|
||||
break
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -f /var/www/override.ini && -f /usr/local/etc/php/conf.d/02-project-override.ini ]; then
|
||||
if [ -f /var/www/override.ini ]; then
|
||||
rm /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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user