From fd24ac20f68dfe5f286821385bc4b37a0c851ed1 Mon Sep 17 00:00:00 2001 From: "art.dambrine" Date: Sun, 4 Apr 2021 19:27:07 +0200 Subject: [PATCH] adapt using GD --- docker-compose.yml | 28 ++++++++++++++-------------- docker/php/Dockerfile | 12 ++++++++++++ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f40ea2e..846f508 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,17 @@ version: '3.8' services: - # mariadb: - # image: mariadb - # restart: on-failure - # volumes: - # - database_pokedex:/var/lib/mysql - # ports: - # - '3306:3306' - # environment: - # MYSQL_ROOT_PASSWORD: root_password - # MYSQL_USER: my_user - # MYSQL_PASSWORD: my_password - # MYSQL_DATABASE: my_pokedex + mariadb: + image: mariadb + restart: on-failure + volumes: + - database_pokedex:/var/lib/mysql + ports: + - '3306:3306' + environment: + MYSQL_ROOT_PASSWORD: root_password + MYSQL_USER: my_user + MYSQL_PASSWORD: my_password + MYSQL_DATABASE: my_pokedex nginx: image: nginx:1.19-alpine @@ -33,5 +33,5 @@ services: - '.:/usr/src/app' user: 1000:1000 -# volumes: -# database_pokedex: \ No newline at end of file +volumes: + database_pokedex: \ No newline at end of file diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index bffd4f4..35108cb 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -9,9 +9,21 @@ RUN apt-get update && \ apt-get install -y \ libzip-dev unzip telnet +# packages +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # needed for gd + libfreetype6-dev \ + libjpeg62-turbo-dev \ + libpng-dev \ + && rm -rf /var/lib/apt/lists/* + RUN docker-php-ext-install zip RUN docker-php-ext-enable apcu +RUN docker-php-ext-configure gd --with-freetype --with-jpeg +RUN docker-php-ext-install gd + RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer RUN composer self-update --1 RUN composer --version