From 72fd1cf02dffb5727bb04235c93f061f4f30530f Mon Sep 17 00:00:00 2001
From: Tchama <mat@collectifs.net>
Date: Fri, 16 Apr 2021 08:44:30 +0200
Subject: [PATCH] fix docker container config

---
 .gitignore                  | 3 ++-
 app/.keep                   | 0
 docker_build/php/Dockerfile | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 app/.keep

diff --git a/.gitignore b/.gitignore
index 540217c..ec33bba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Comment to include Symfony project
-app
+app/*
+!app/.keep
 
 # Ignore Database datas
 data
diff --git a/app/.keep b/app/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/docker_build/php/Dockerfile b/docker_build/php/Dockerfile
index d80f8f7..cf638a7 100644
--- a/docker_build/php/Dockerfile
+++ b/docker_build/php/Dockerfile
@@ -51,7 +51,7 @@ RUN { \
     } >> /usr/local/etc/php/conf.d/date.ini
 
 # Install composer
-# RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 # Symfony installer
 RUN curl -sS https://get.symfony.com/cli/installer -o /usr/local/bin/installer | bash  \
@@ -64,4 +64,11 @@ RUN curl -sS https://get.symfony.com/cli/installer -o /usr/local/bin/installer |
 RUN groupadd --gid ${GID} "group${GID}" \
    && useradd --uid ${UID} --gid ${GID} --create-home "user${UID}"
 
+USER ${UID}
+
+RUN   git config --global user.email "docker-php-master@champs-libres.coop" \
+   && git config --global user.name "Docker PHP Master"
+
+USER root
+
 WORKDIR "/var/www/app"