diff --git a/.env-dist b/.env-dist index 1406c954b..bfeed96f3 100644 --- a/.env-dist +++ b/.env-dist @@ -1,3 +1,3 @@ -## Options to pass to `docker-compose up` command +## Options to pass to `docker compose up` command #DOCKER_UP_OPTIONS= -d # -d will launch container in detached mode #ENABLE_XDEBUG=true # enable the PHP xDebug extension diff --git a/.gitignore b/.gitignore index 30b5ff288..262ed972f 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,7 @@ js_dist /bin/php-cs-fixer /bin/simple-phpunit /bin/vobject -/docker-compose.override.yml +/compose.override.yml /composer.phar /data diff --git a/Makefile b/Makefile index 1b14b80b6..46616855c 100644 --- a/Makefile +++ b/Makefile @@ -2,29 +2,30 @@ CURRENT_UID ?= $(shell id -u) DOCKER_UP_OPTIONS ?= +DOCKER_COMPOSE_BIN ?= docker compose .PHONY: install docker-up docker-stop docker-down test hooks vendors db-seed db-migrations reset-db init console phpstan install: vendors -docker-up: .env var/logs/.docker-build data docker-compose.override.yml - CURRENT_UID=$(CURRENT_UID) docker-compose up $(DOCKER_UP_OPTIONS) +docker-up: .env var/logs/.docker-build data compose.override.yml + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) up $(DOCKER_UP_OPTIONS) docker-stop: - CURRENT_UID=$(CURRENT_UID) docker-compose stop + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop docker-down: - CURRENT_UID=$(CURRENT_UID) docker-compose down + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) down -var/logs/.docker-build: docker-compose.yml docker-compose.override.yml $(shell find docker -type f) - CURRENT_UID=$(CURRENT_UID) ENABLE_XDEBUG=$(ENABLE_XDEBUG) docker-compose build +var/logs/.docker-build: compose.yml compose.override.yml $(shell find docker -type f) + CURRENT_UID=$(CURRENT_UID) ENABLE_XDEBUG=$(ENABLE_XDEBUG) $(DOCKER_COMPOSE_BIN) build touch var/logs/.docker-build .env: cp .env-dist .env -docker-compose.override.yml: - cp docker-compose.override.yml-dist docker-compose.override.yml +compose.override.yml: + cp compose.override.yml-dist compose.override.yml vendors: vendor node_modules @@ -58,12 +59,12 @@ init: init-db: make reset-db - CURRENT_UID=$(CURRENT_UID) docker-compose run --rm cliphp make db-migrations - CURRENT_UID=$(CURRENT_UID) docker-compose run --rm cliphp make db-seed + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --rm cliphp make db-migrations + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --rm cliphp make db-seed config: configs/application/config.php app/config/parameters.yml - CURRENT_UID=$(CURRENT_UID) docker-compose run --no-deps --rm cliphp make vendors - CURRENT_UID=$(CURRENT_UID) docker-compose run --no-deps --rm cliphp make assets + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm cliphp make vendors + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm cliphp make assets test: ./bin/atoum @@ -71,11 +72,11 @@ test: test-functional: data config htdocs/uploads - CURRENT_UID=$(CURRENT_UID) docker-compose stop dbtest apachephptest planetetest mailcatcher - CURRENT_UID=$(CURRENT_UID) docker-compose up -d dbtest apachephptest planetetest mailcatcher - CURRENT_UID=$(CURRENT_UID) docker-compose run --no-deps --rm cliphp ./bin/behat - CURRENT_UID=$(CURRENT_UID) docker-compose run --no-deps --rm cliphp ./bin/behat -c behat-planete.yml - CURRENT_UID=$(CURRENT_UID) docker-compose stop dbtest apachephptest planetetest mailcatcher + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop dbtest apachephptest planetetest mailcatcher + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) up -d dbtest apachephptest planetetest mailcatcher + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm cliphp ./bin/behat + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm cliphp ./bin/behat -c behat-planete.yml + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop dbtest apachephptest planetetest mailcatcher data: mkdir data @@ -88,17 +89,17 @@ hooks: .git/hooks/pre-commit .git/hooks/post-checkout .git/hooks/pre-commit: Makefile echo "#!/bin/sh" > .git/hooks/pre-commit - echo "docker-compose run --rm cliphp make test" >> .git/hooks/pre-commit + echo "docker compose run --rm cliphp make test" >> .git/hooks/pre-commit chmod +x .git/hooks/pre-commit .git/hooks/post-checkout: Makefile echo "#!/bin/sh" > .git/hooks/post-checkout - echo "docker-compose run --rm cliphp make vendor" >> .git/hooks/post-checkout + echo "docker compose run --rm cliphp make vendor" >> .git/hooks/post-checkout chmod +x .git/hooks/post-checkout reset-db: - echo 'DROP DATABASE IF EXISTS web' | docker-compose run --rm db /opt/mysql_no_db - echo 'CREATE DATABASE web' | docker-compose run --rm db /opt/mysql_no_db + echo 'DROP DATABASE IF EXISTS web' | $(DOCKER_COMPOSE_BIN) run -T --rm db /opt/mysql_no_db + echo 'CREATE DATABASE web' | $(DOCKER_COMPOSE_BIN) -T --rm db /opt/mysql_no_db db-migrations: php bin/phinx migrate @@ -107,7 +108,7 @@ db-seed: php bin/phinx seed:run console: - CURRENT_UID=$(CURRENT_UID) docker-compose run --rm cliphp bash + CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --rm cliphp bash phpstan: docker run -v $(shell pwd):/app --rm ghcr.io/phpstan/phpstan diff --git a/README.md b/README.md index 39c05d2c6..e5402c0a2 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ ## Applications On accède aux applications via docker et les différents ports des applications. -Vous retrouverez les ports dans le fichier `docker-compose.override.yml` +Vous retrouverez les ports dans le fichier `compose.override.yml` Par défaut: * Site AFUP : * Planète PHP : * Mailcatcher: -_Les ports utilisés peuvent être modifiés dans le fichier `docker-compose.override.yml`._ +_Les ports utilisés peuvent être modifiés dans le fichier `compose.override.yml`._ ## Mise en place avec docker @@ -30,8 +30,7 @@ Vous pouvez aussi y accéder directement via la commande: `docker/bin/mysql` * `make docker-stop` : éteint les containers en fonctionnement. * `make docker-down` : détruit les containers existants. * `docker/bin/mysql` : connexion à la base de données. -* `docker/bin/bash` : PHP 5.6 cli. -* `docker/bin/bashphp7` : PHP 7.0 cli. +* `docker/bin/bash` : PHP cli. ### Configuration avancée @@ -42,7 +41,7 @@ Ce fichier contient la liste des options disponibles. #### `DOCKER_UP_OPTIONS` -liste des options à passer à la commande `docker-composer up`. +liste des options à passer à la commande `docker composer up`. ## Base de données diff --git a/docker-compose.override.yml-dist b/compose.override.yml-dist similarity index 100% rename from docker-compose.override.yml-dist rename to compose.override.yml-dist diff --git a/docker-compose.yml b/compose.yml similarity index 79% rename from docker-compose.yml rename to compose.yml index e0711149e..ccbead964 100644 --- a/docker-compose.yml +++ b/compose.yml @@ -40,21 +40,6 @@ services: - db - mailcatcher - apachephp7: - build: - context: ./docker/dockerfiles/apachephp7 - args: - uid: ${CURRENT_UID:-1001} - gid: "1001" - ENABLE_XDEBUG: ${ENABLE_XDEBUG:-false} - environment: - SYMFONY_ENV: "dev" - volumes: - - ./:/var/www/html - links: - - db - - mailcatcher - apachephptest: build: context: ./docker/dockerfiles/apachephp @@ -128,21 +113,5 @@ services: - dbtest command: "false" - cliphp7: - build: - context: ./docker/dockerfiles/apachephp7 - args: - uid: ${CURRENT_UID:-1001} - gid: "1001" - ENABLE_XDEBUG: ${ENABLE_XDEBUG:-false} - user: localUser - volumes: - - ./data/composer:/home/localUser/.composer - - ./:/var/www/html - links: - - db - - mailcatcher - command: "false" - mailcatcher: image: dockage/mailcatcher:0.9.0 diff --git a/docker/bin/bash b/docker/bin/bash index 9105f4f94..8f9b8beed 100755 --- a/docker/bin/bash +++ b/docker/bin/bash @@ -1,2 +1,2 @@ #!/bin/bash -docker-compose run --rm cliphp /bin/bash +docker compose run --rm cliphp /bin/bash diff --git a/docker/bin/bashphp7 b/docker/bin/bashphp7 deleted file mode 100755 index 674007cc1..000000000 --- a/docker/bin/bashphp7 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker-compose run --rm cliphp7 /bin/bash diff --git a/docker/bin/mysql b/docker/bin/mysql index 2ef006df6..62390350c 100755 --- a/docker/bin/mysql +++ b/docker/bin/mysql @@ -1,3 +1,2 @@ #!/bin/bash -docker-compose run --rm db /opt/mysql - +docker compose run --rm db /opt/mysql diff --git a/docker/bin/mysql_event b/docker/bin/mysql_event index 8567a9ed0..951fd3bc6 100755 --- a/docker/bin/mysql_event +++ b/docker/bin/mysql_event @@ -1,3 +1,2 @@ #!/bin/bash -docker-compose run --rm dbevent /opt/mysql - +docker compose run --rm dbevent /opt/mysql diff --git a/docker/dockerfiles/apachephp/Dockerfile b/docker/dockerfiles/apachephp/Dockerfile index f976bf0cf..efd00a119 100644 --- a/docker/dockerfiles/apachephp/Dockerfile +++ b/docker/dockerfiles/apachephp/Dockerfile @@ -1,9 +1,9 @@ -FROM php:5.6-apache - -ARG ENABLE_XDEBUG=false +FROM php:7.0-apache RUN echo 'deb http://archive.debian.org/debian stretch main' > /etc/apt/sources.list +ARG ENABLE_XDEBUG=false + ## Update system RUN apt-get update && \ apt-get upgrade -y && \ @@ -24,8 +24,8 @@ RUN apt-get update && \ libicu-dev \ wget && \ docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \ - docker-php-ext-install pdo_mysql mbstring mysqli zip gd mcrypt intl && \ - if [ "$ENABLE_XDEBUG" = "true" ]; then pecl install xdebug-2.5.5 && docker-php-ext-enable xdebug; fi && \ + docker-php-ext-install pdo_mysql mbstring mysqli zip gd mcrypt intl pcntl && \ + if [ "$ENABLE_XDEBUG" = "true" ]; then pecl install xdebug-2.6.1 && docker-php-ext-enable xdebug; fi && \ apt-get autoremove --purge -y && \ rm -rf /var/lib/apt/lists/* @@ -45,6 +45,7 @@ RUN apt-get update && \ gnupg && \ curl -k -sL https://deb.nodesource.com/setup_6.x | bash - && \ apt-get install -y nodejs && \ + apt-get autoremove --purge -y && \ rm -rf /var/lib/apt/lists/* RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ diff --git a/docker/dockerfiles/apachephp7/Dockerfile b/docker/dockerfiles/apachephp7/Dockerfile deleted file mode 100644 index 1d452be8f..000000000 --- a/docker/dockerfiles/apachephp7/Dockerfile +++ /dev/null @@ -1,73 +0,0 @@ -FROM php:7.0-apache - -RUN echo 'deb http://archive.debian.org/debian stretch main' > /etc/apt/sources.list - -ARG ENABLE_XDEBUG=false - -## Update system -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get autoremove --purge -y && \ - rm -rf /var/lib/apt/lists/* - -RUN if [ "$ENABLE_XDEBUG" = "true" ]; then echo ************ XDEBUG ENABLED **********; \ -else echo ------------ XDEBUG DISABLED ==========; fi - -# Install required php extensions for afup website and other management package -RUN apt-get update && \ - apt-get install -y \ - libfreetype6-dev \ - libjpeg62-turbo-dev \ - libpng-dev \ - libmcrypt4 \ - libmcrypt-dev \ - libicu-dev \ - wget && \ - docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \ - docker-php-ext-install pdo_mysql mbstring mysqli zip gd mcrypt intl && \ - if [ "$ENABLE_XDEBUG" = "true" ]; then pecl install xdebug-2.6.1 && docker-php-ext-enable xdebug; fi && \ - apt-get autoremove --purge -y && \ - rm -rf /var/lib/apt/lists/* - -# Configuration of apache & php -COPY apache.conf /etc/apache2/sites-available/000-default.conf - -RUN a2enmod rewrite && \ - echo "Include sites-enabled/" >> /etc/apache2/apache2.conf && \ - rm /etc/apache2/sites-enabled/000-default.conf && \ - ln -s /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-enabled/000-default.conf && \ - echo "date.timezone=Europe/Paris" >> "/usr/local/etc/php/php.ini" - -RUN apt-get update && \ - apt-get install -y \ - build-essential \ - wget \ - gnupg && \ - curl -k -sL https://deb.nodesource.com/setup_6.x | bash - && \ - apt-get install -y nodejs && \ - rm -rf /var/lib/apt/lists/* - -RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - apt-get update && \ - apt-get install -y yarn && \ - rm -rf /var/lib/apt/lists/* - -RUN pecl install ast-1.0.1 -RUN echo 'extension=ast.so' >> "/usr/local/etc/php/php.ini" -RUN docker-php-ext-install pcntl - -# Install local user mapped to the host user uid -ARG uid=1008 -ARG gid=1008 - -RUN groupadd -g ${gid} localUser && \ - useradd -l -u ${uid} -g ${gid} -m -s /bin/bash localUser && \ - usermod -a -G www-data localUser && \ - sed --in-place "s/User \${APACHE_RUN_USER}/User localUser/" /etc/apache2/apache2.conf && \ - sed --in-place "s/Group \${APACHE_RUN_GROUP}/Group localUser/" /etc/apache2/apache2.conf - -COPY apache.crt /etc/apache2/ssl/apache.crt -COPY apache.key /etc/apache2/ssl/apache.key - -RUN a2enmod ssl diff --git a/docker/dockerfiles/apachephp7/apache.conf b/docker/dockerfiles/apachephp7/apache.conf deleted file mode 100644 index 81791f4c7..000000000 --- a/docker/dockerfiles/apachephp7/apache.conf +++ /dev/null @@ -1,12 +0,0 @@ - - SSLEngine On - SSLCertificateFile /etc/apache2/ssl/apache.crt - SSLCertificateKeyFile /etc/apache2/ssl/apache.key - DocumentRoot /var/www/html/htdocs - - Options Indexes FollowSymLinks MultiViews - AllowOverride All - Require all granted - SetEnv ALLOW_BLOG_FROM_ALL 1 - - diff --git a/docker/dockerfiles/apachephp7/apache.crt b/docker/dockerfiles/apachephp7/apache.crt deleted file mode 100644 index 5f2e6b6e6..000000000 --- a/docker/dockerfiles/apachephp7/apache.crt +++ /dev/null @@ -1,35 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIGFTCCA/2gAwIBAgIJAOQVkAeZEpj8MA0GCSqGSIb3DQEBCwUAMFkxCzAJBgNV -BAYTAkZSMQ4wDAYDVQQIDAVQYXJpczEOMAwGA1UEBwwFUGFyaXMxFTATBgNVBAoM -DE1PTlNJRVVSIEJJWjETMBEGA1UEAwwKKi5hZnVwLmRldjAeFw0xNzA2MTcxNjA3 -NTlaFw0yNzA2MTUxNjA3NTlaMFkxCzAJBgNVBAYTAkZSMQ4wDAYDVQQIDAVQYXJp -czEOMAwGA1UEBwwFUGFyaXMxFTATBgNVBAoMDE1PTlNJRVVSIEJJWjETMBEGA1UE -AwwKKi5hZnVwLmRldjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANds -tKTQvIwu+ks2TB7YiCo1r6w9R4oPQ1364DCJWm9M9yrYOqSYxC2wjnOFjlgWDNO9 -gKWGhyNsBue0HDXbGPujmCy/rpBysVqzM9200rCRS9IgNtUNsDmgmHbjxr1YpTfk -YD3XaYkTfXrDK/XUyUwt5pN+1KAyywAr6HLKz36j7FzBtIc3HMW2n9VZ1MYaRWoW -yDzknrPBj2+3K/xwJr4p6gwf5lnuHQ7RcnmL9Q6ioLAU2iHXov+LrPZtkC2HdDHy -eLcJf1l07lxAPDl2DArmHZOPpQSicaWrtTBdS1rIVWH1+lYQb6HdrKKztKsDscea -j+20jOTLhcfwOWMErU89HWmiVMtZ+MhEuR4iKACDk1E4w31lgk9VK6dzxzymGaFR -GtPsqp9tp8XZvbIsw1C8eXlS6ADUAwTmxecqJsXwep2fFbkvowvdL6bMM1SRnCOs -c/s0MgX9Yp7cswcMjOnAyQmMxfi+oN9HcGAI1P44YnVyDn9REYx/hS6q1vRj/HMk -ciJt3fpLjuvCGiyfOzoOzd/c881HwXfc8nxBoRbsxOLhxUlC05bkTqcC22xxp+u1 -Ijlmpa7lj/AhE/kopDRO0yx5LiwhoFQyuXD4Ozamo8ucL10YbNBuZkoxZkic7b9f -WdsMfXKOGII7dzbOQkioGIxuP9qENQ5RGL7xskZZAgMBAAGjgd8wgdwwHQYDVR0O -BBYEFMXu16/tfjItT4KeUdjkhX+1ZIMkMIGLBgNVHSMEgYMwgYCAFMXu16/tfjIt -T4KeUdjkhX+1ZIMkoV2kWzBZMQswCQYDVQQGEwJGUjEOMAwGA1UECAwFUGFyaXMx -DjAMBgNVBAcMBVBhcmlzMRUwEwYDVQQKDAxNT05TSUVVUiBCSVoxEzARBgNVBAMM -CiouYWZ1cC5kZXaCCQDkFZAHmRKY/DAMBgNVHRMEBTADAQH/MB8GA1UdEQQYMBaC -CiouYWZ1cC5kZXaCCGFmdXAuZGV2MA0GCSqGSIb3DQEBCwUAA4ICAQBzdh+xh/mA -EYFGk9bdSxkHMBjPUvy7zdMUYQlA09fBAevqRgPZZhXwgQiwrBq1lLsPIshKPPTt -mgphkBjgcmiW3b429pc/3kFz5HYYYEp2zfGdf0FpR8hU0jkmIeeN7P9qsJRiOmd+ -nQqbWZet672Y+Uzey6t0WUviAZCD5gVDBkkFD4pQiPd34Jj13H6fgB3Hd4aa1wZR -8dDNokxlWMY2TZzpyW2lslp8Gt4PHUrzxEEGeh+SJOj+MBYQblZkVIF2iM3FJRvx -3LgqAW9oUIwoRN3YgTmAtuR/e8pB4fBo4nGgfatwMbKQ1ncknWHMbsXkm2TehSqe -8VisitICw2rSmuWvlzHe/d0EqGoyDXN00wd0uWQfejlEXATPYnD1Ps0Wej9ymaml -885/1/2vinA3LOK4f/0W+UZg6kW+jO6L5P9MRh2rhJOuWPZEcX3/If2Gki17OnZW -WS+2rPKTtTTxjwvlkhtDbG8r+TFV3C5YE16B0uTFx5iQBzit4EKOLqY50KMFctqk -D7WEP3WvPO/+GkVaDWuY265xSsZ8eLPEEt+/xQ6E4YX0peSOijZpOs3ABR7D5y50 -Mf2kGtXVb5it3VorExFPor0w/vfbks487ROi2AGftXoI3R96fK7HJXRqyc8SSId5 -D7wwRsw3hoZULKQ1+jgXl47Ig1tzER5/ZA== ------END CERTIFICATE----- diff --git a/docker/dockerfiles/apachephp7/apache.key b/docker/dockerfiles/apachephp7/apache.key deleted file mode 100644 index c3fb364ce..000000000 --- a/docker/dockerfiles/apachephp7/apache.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/docker/dockerfiles/mailcatcher/Dockerfile b/docker/dockerfiles/mailcatcher/Dockerfile deleted file mode 100644 index d6cc653d8..000000000 --- a/docker/dockerfiles/mailcatcher/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM alpine:3.9 - -RUN apk add --no-cache ca-certificates openssl - -RUN apk add --no-cache \ - ruby \ - ruby-bigdecimal \ - ruby-etc \ - ruby-json \ - libstdc++ \ - sqlite-libs - -ARG MAILCATCHER_VERSION=0.7.1 - -RUN apk add --no-cache --virtual .build-deps \ - ruby-dev \ - make g++ \ - sqlite-dev \ - && gem install -v 0.4.0 timeout --no-ri --no-rdoc \ - && gem install -v 0.1.2 net-protocol --no-ri --no-rdoc \ - && gem install -v 0.3.0 net-smtp --no-ri --no-rdoc \ - && gem install -v 0.2.2 net-imap --no-ri --no-rdoc \ - && gem install -v 1.1.2 mini_mime --no-ri --no-rdoc \ - && gem install -v 1.6.7 sqlite3 --no-ri --no-rdoc \ - && gem install -v $MAILCATCHER_VERSION mailcatcher --no-ri --no-rdoc \ - && apk del .build-deps - -EXPOSE 1025 1080 - -CMD ["mailcatcher", "--foreground", "--ip=0.0.0.0", "--smtp-port=1025", "--http-port=1080"] diff --git a/docker/dockerfiles/planete/Dockerfile b/docker/dockerfiles/planete/Dockerfile index 588da7354..7edb19439 100644 --- a/docker/dockerfiles/planete/Dockerfile +++ b/docker/dockerfiles/planete/Dockerfile @@ -1,22 +1,11 @@ -FROM php:5.6-apache +FROM php:7.0-apache RUN echo 'deb http://archive.debian.org/debian stretch main' > /etc/apt/sources.list # Install required php extensions for afup website and other management package RUN apt-get update && \ - apt-get install -y \ - libfreetype6-dev \ - libjpeg62-turbo-dev \ - libpng-dev \ - libmcrypt4 \ - libmcrypt-dev \ - wget && \ - docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \ - docker-php-ext-install pdo_mysql mbstring mysqli zip gd mcrypt && \ - apt-get remove -y \ - libfreetype6-dev \ - libjpeg62-turbo-dev \ - libpng-dev && \ + docker-php-ext-install pdo_mysql && \ + apt-get autoremove --purge -y && \ rm -rf /var/lib/apt/lists/* # Configuration of apache & php