php override, normalize path, php_helper
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
45d0eb04a0
commit
54ff499e2d
@ -61,6 +61,7 @@ RUN docker-php-ext-install -j$(nproc) \
|
|||||||
#
|
#
|
||||||
#==================================================
|
#==================================================
|
||||||
FROM php:${PHP_VERSION}
|
FROM php:${PHP_VERSION}
|
||||||
|
ARG ENVIRONMENT=production
|
||||||
|
|
||||||
# install system libs
|
# install system libs
|
||||||
RUN apk add --no-cache libintl c-client libpng icu-libs libldap libpq libzip
|
RUN apk add --no-cache libintl c-client libpng icu-libs libldap libpq libzip
|
||||||
@ -80,11 +81,11 @@ COPY --from=base-config /etc/supervisor /etc/supervisor
|
|||||||
COPY --from=builder /usr/local/lib/php /usr/local/lib/php
|
COPY --from=builder /usr/local/lib/php /usr/local/lib/php
|
||||||
COPY --from=builder /usr/local/etc /usr/local/etc
|
COPY --from=builder /usr/local/etc /usr/local/etc
|
||||||
|
|
||||||
# Copy docker tools
|
# Copy base files to docker container
|
||||||
COPY docker/tools /usr/local/bin/
|
COPY docker/ /
|
||||||
|
|
||||||
#install composer
|
#PHP helper
|
||||||
RUN /usr/local/bin/install_composer.sh
|
RUN /usr/local/bin/php_helper.sh
|
||||||
|
|
||||||
#install cachetool
|
#install cachetool
|
||||||
RUN wget -O /bin/cachetool http://gordalina.github.io/cachetool/downloads/cachetool.phar
|
RUN wget -O /bin/cachetool http://gordalina.github.io/cachetool/downloads/cachetool.phar
|
||||||
|
@ -3,6 +3,11 @@
|
|||||||
PHP_VERSION=`php -r 'echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;'`
|
PHP_VERSION=`php -r 'echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;'`
|
||||||
|
|
||||||
|
|
||||||
|
if [ -f /usr/local/etc/php/php.ini-$ENVIRONMENT ]; then
|
||||||
|
mv /usr/local/etc/php/php.ini-$ENVIRONMENT /usr/local/etc/php/php.ini
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ $PHP_VERSION = '72' ]; then
|
if [ $PHP_VERSION = '72' ]; then
|
||||||
wget -O /bin/composer https://getcomposer.org/composer-1.phar
|
wget -O /bin/composer https://getcomposer.org/composer-1.phar
|
||||||
else
|
else
|
||||||
@ -15,3 +20,10 @@ chmod a+x /bin/composer
|
|||||||
if [ $PHP_VERSION = '72' ]; then
|
if [ $PHP_VERSION = '72' ]; then
|
||||||
composer global require hirak/prestissimo
|
composer global require hirak/prestissimo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ $ENVIRONMENT = 'development' ]; then
|
||||||
|
apk --update --no-cache add autoconf g++ make
|
||||||
|
pecl install -f xdebug
|
||||||
|
docker-php-ext-enable xdebug
|
||||||
|
apk del --purge autoconf g++ make
|
||||||
|
fi
|
1
docker/usr/local/etc/php/conf.d/php-override.ini
Normal file
1
docker/usr/local/etc/php/conf.d/php-override.ini
Normal file
@ -0,0 +1 @@
|
|||||||
|
memory_limit = 512M
|
1931
docker/usr/local/etc/php/php.ini
Normal file
1931
docker/usr/local/etc/php/php.ini
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user