From 1726a3d558fff8da1b715dafc704d5bc8cd8671a Mon Sep 17 00:00:00 2001
From: "art.dambrine" <art.dambrine@gmail.com>
Date: Thu, 25 Mar 2021 16:14:30 +0100
Subject: [PATCH] fix usage of composer in php container

---
 docker-compose.yml        |  5 +++--
 docker/nginx/default.conf |  4 ++--
 docker/php/Dockerfile     | 16 ++++++++++++++--
 init.sh                   |  2 +-
 readme.md                 |  1 -
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 96e483e..5d433c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,17 +13,18 @@ services:
     image: nginx:1.19-alpine
     restart: on-failure
     volumes:
-      - './src/public:/usr/src/app'
       - './docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro'
     ports:
       - '80:80'
     depends_on:
       - php
+    volumes_from:
+      - php
   php:
     build:
       context: .
       dockerfile: docker/php/Dockerfile
     restart: on-failure
     volumes:
-      - './src:/usr/src/app'
+      - '.:/usr/src/app'
     user: 1000:1000
\ No newline at end of file
diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 98e3c3b..53c5dfd 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -3,7 +3,7 @@
      server_name ~.*;
     
      location / {
-         root /usr/src/app;
+         root /usr/src/app/src/public;
     
          try_files $uri /index.php$is_args$args;
      }
@@ -15,7 +15,7 @@
          fastcgi_buffers 16 16k;
          fastcgi_buffer_size 32k;
          include fastcgi_params;
-         fastcgi_param SCRIPT_FILENAME /usr/src/app/public/index.php;
+         fastcgi_param SCRIPT_FILENAME /usr/src/app/src/public/index.php;
      }
     
      error_log /dev/stderr debug;
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 3c17bfd..30aac00 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -12,8 +12,20 @@ libzip-dev telnet
 RUN docker-php-ext-install zip
 RUN docker-php-ext-enable apcu
 
-WORKDIR /usr/src/app
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN composer self-update --1
+RUN composer --version
+
+RUN groupadd dev -g 999
+RUN useradd dev -g dev -d /home/dev -m
+
+RUN echo "memory_limit = 500G" >> /usr/local/etc/php/conf.d/docker-php-memory-limits.ini
+RUN echo "upload_max_filesize = 20M" >> /usr/local/etc/php/conf.d/docker-php-upload.ini
+RUN echo "post_max_size = 20M" >> /usr/local/etc/php/conf.d/docker-php-post.ini
+RUN echo "max_execution_time  = 600" >> /usr/local/etc/php/conf.d/docker-php-max-execution-time.ini
 
-# COPY --chown=1000:1000 src /usr/src/app # pour mise en prod (pour dev on partage le folder avec l'hôte)
+RUN echo 'alias sf="php bin/console"' >> ~/.bashrc
+
+WORKDIR /usr/src/app
 
 RUN PATH=$PATH:/usr/src/app/vendor/bin:bin
\ No newline at end of file
diff --git a/init.sh b/init.sh
index 3c82922..f9fe587 100755
--- a/init.sh
+++ b/init.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-composer create-project symfony/website-skeleton src
\ No newline at end of file
+docker-compose exec php composer create-project symfony/website-skeleton src
diff --git a/readme.md b/readme.md
index b8cf0e5..bf6b95d 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,5 @@
 ## Prérequis
 - **docker**
-- **composer**
 
 ## Mise en place rapide d'un projet symfony avec docker