diff --git a/Dockerfile b/Dockerfile index dd0ad92..4d6aab2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3-apache +FROM php:7.4-apache ONBUILD ARG GIT_REFERENCE ONBUILD ENV GIT_REFERENCE ${GIT_REFERENCE:-HEAD} @@ -57,10 +57,9 @@ RUN echo "de_DE.UTF-8 UTF-8" >> /etc/locale.gen \ && locale-gen RUN apt-get update && \ - apt-get install -y --no-install-recommends libssl1.0-dev libpng-dev libjpeg-dev libfreetype6-dev zlib1g-dev \ + apt-get install -y --no-install-recommends libssl-dev libpng-dev libjpeg-dev libfreetype6-dev zlib1g-dev \ libcurl4-openssl-dev libevent-dev libicu-dev libidn11-dev libidn2-0-dev && \ - docker-php-ext-configure gd --enable-gd-native-ttf --with-jpeg-dir=/usr/lib/x86_64-linux-gnu \ - --with-png-dir=/usr/lib/x86_64-linux-gnu --with-freetype-dir=/usr/lib/x86_64-linux-gnu && \ + docker-php-ext-configure gd --with-jpeg --with-freetype && \ docker-php-ext-install bcmath opcache gd pdo_mysql exif intl zip sockets && \ pecl install mongodb && docker-php-ext-enable mongodb && \ pecl install apcu && docker-php-ext-enable apcu && \ diff --git a/conf/symfony-presets.ini b/conf/symfony-presets.ini index 4c51e5b..8fb5e28 100644 --- a/conf/symfony-presets.ini +++ b/conf/symfony-presets.ini @@ -1,3 +1,5 @@ +expose_php=Off + ; see https://symfony.com/doc/current/performance.html#performance-use-opcache opcache.validate_timestamps=0 diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile index 9c82e3f..83f7a49 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3-fpm-alpine +FROM php:7.4-fpm-alpine COPY --from=composer:latest /usr/bin/composer /usr/bin/composer @@ -17,15 +17,12 @@ ONBUILD LABEL org.label-schema.vendor="Wizbii" \ org.label-schema.schema-version="1.0" \ org.label-schema.build-date="${BUILD_DATE}" -RUN apk add --no-cache autoconf openssl-dev g++ make pcre-dev icu-dev zlib-dev libzip-dev && \ +RUN apk add --no-cache gnu-libiconv autoconf openssl-dev g++ make pcre-dev icu-dev zlib-dev libzip-dev && \ mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \ pecl install mongodb && \ docker-php-ext-enable mongodb && \ docker-php-ext-install bcmath intl opcache zip sockets && \ version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") && \ - curl -A "Docker" -o $(php -r "echo ini_get('extension_dir');")/blackfire.so -D -s https://packages.blackfire.io/binaries/blackfire-php/1.24.4/blackfire-php-alpine_amd64-php-$version.so && \ - printf "extension=blackfire.so\nblackfire.agent_socket=tcp://10.1.1.1:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini && \ - apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted && \ apk del --purge autoconf g++ make COPY conf/symfony-presets.ini $PHP_INI_DIR/conf.d diff --git a/ppm-alpine/Dockerfile b/ppm-alpine/Dockerfile deleted file mode 100644 index 1c9d7c8..0000000 --- a/ppm-alpine/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM php:7.3-alpine - -COPY --from=composer:latest /usr/bin/composer /usr/bin/composer - -ONBUILD ARG GIT_REFERENCE -ONBUILD ENV GIT_REFERENCE ${GIT_REFERENCE:-HEAD} - -ONBUILD ARG BUILD_DATE -ONBUILD ENV BUILD_DATE ${BUILD_DATE:-unknown} - -ONBUILD ARG BASE_PATH -ONBUILD ENV BASE_PATH ${BASE_PATH:-/usr/src/app} - -ONBUILD WORKDIR ${BASE_PATH} - -ONBUILD LABEL org.label-schema.vendor="Wizbii" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.build-date="${BUILD_DATE}" - -RUN apk add --no-cache autoconf openssl-dev g++ make pcre-dev icu-dev zlib-dev libzip-dev && \ - pecl install mongodb && \ - docker-php-ext-enable mongodb && \ - docker-php-ext-install pcntl bcmath intl opcache zip sockets && \ - version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") && \ - curl -A "Docker" -o $(php -r "echo ini_get('extension_dir');")/blackfire.so -D -s https://packages.blackfire.io/binaries/blackfire-php/1.24.4/blackfire-php-alpine_amd64-php-$version.so && \ - printf "extension=blackfire.so\nblackfire.agent_socket=tcp://10.1.1.1:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini && \ - apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted && \ - apk del --purge autoconf g++ make - -ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php - -RUN mkdir /ppm && cd /ppm && \ - composer require php-pm/php-pm && \ - composer require php-pm/httpkernel-adapter && \ - ln -s /ppm/vendor/bin/ppm /usr/local/bin/ppm - -CMD ppm start --ansi --host 0.0.0.0 --app-env=prod --debug=0 --port=80 --logging=0 diff --git a/rc-fpm-alpine/Dockerfile b/rc-fpm-alpine/Dockerfile index f8980e8..1801b01 100644 --- a/rc-fpm-alpine/Dockerfile +++ b/rc-fpm-alpine/Dockerfile @@ -17,13 +17,12 @@ ONBUILD LABEL org.label-schema.vendor="Wizbii" \ org.label-schema.schema-version="1.0" \ org.label-schema.build-date="${BUILD_DATE}" -RUN apk add --no-cache autoconf openssl-dev g++ make pcre-dev icu-dev zlib-dev libzip-dev && \ +RUN apk add --no-cache autoconf gnu-libiconv openssl-dev g++ make pcre-dev icu-dev zlib-dev libzip-dev && \ mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \ pecl install mongodb && \ docker-php-ext-enable mongodb && \ docker-php-ext-install bcmath intl opcache zip sockets && \ version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") && \ - apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted && \ apk del --purge autoconf g++ make COPY conf/symfony-presets.ini $PHP_INI_DIR/conf.d