diff --git a/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm b/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm index c715a4d..edcf6d7 100644 --- a/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm +++ b/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm @@ -1,7 +1,8 @@ FROM php:7.2-fpm-alpine -RUN apk add --no-cache postgresql-dev && \ +RUN apk add --update-cache libpq postgresql-dev && \ docker-php-ext-install pdo_mysql pdo_pgsql && \ + apk del postgresql-dev && rm -rf /var/cache/apk/* && \ mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \ mkdir /var/www/phpinfo && \ echo " /var/www/phpinfo/phpinfo.php && \ diff --git a/docker/dev/mtt-php72-angie-postgres10/compose.yml b/docker/dev/mtt-php72-angie-postgres10/compose.yml index 406c46d..88f91df 100644 --- a/docker/dev/mtt-php72-angie-postgres10/compose.yml +++ b/docker/dev/mtt-php72-angie-postgres10/compose.yml @@ -47,6 +47,7 @@ services: # do not use alpine image due to missing locales image: postgres:10.0 container_name: ${PLATFORM_NAME}-db + userns_mode: keep-id environment: POSTGRES_PASSWORD: mtt POSTGRES_USER: mtt diff --git a/docker/dev/mtt-php72-apache-postgres10/compose.yml b/docker/dev/mtt-php72-apache-postgres10/compose.yml index e903990..e1b0e71 100644 --- a/docker/dev/mtt-php72-apache-postgres10/compose.yml +++ b/docker/dev/mtt-php72-apache-postgres10/compose.yml @@ -34,6 +34,7 @@ services: # do not use alpine image due to missing locales image: postgres:10.0 container_name: ${PLATFORM_NAME}-db + userns_mode: keep-id environment: POSTGRES_PASSWORD: mtt POSTGRES_USER: mtt diff --git a/docker/dev/mtt-php72-apache/Dockerfile-web b/docker/dev/mtt-php72-apache/Dockerfile-web index d60eddc..ee64439 100644 --- a/docker/dev/mtt-php72-apache/Dockerfile-web +++ b/docker/dev/mtt-php72-apache/Dockerfile-web @@ -1,7 +1,8 @@ -FROM php:7.2-apache +FROM php:7.2-apache-buster -RUN apt-get update && apt-get install -y libicu-dev libpq-dev && apt-get -y autoremove && \ +RUN apt-get update && apt-get install -y libpq5 libpq-dev && \ docker-php-ext-install mysqli pdo_pgsql && \ + apt-get remove -y libpq-dev && apt-get -y autoremove && \ mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \ mkdir /var/www/phpinfo && \ echo " /var/www/phpinfo/phpinfo.php && \ @@ -13,5 +14,5 @@ RUN apt-get update && apt-get install -y libicu-dev libpq-dev && apt-get -y auto ln -s html /var/www/src -#COPY php-mtt.ini /usr/local/etc/php/conf.d/ -#COPY php-opcache.ini /usr/local/etc/php/conf.d/ +COPY php-mtt.ini /usr/local/etc/php/conf.d/ +COPY php-opcache.ini /usr/local/etc/php/conf.d/