From 636a08bb4cffbc6188c30b0dc02bb4e42a860a13 Mon Sep 17 00:00:00 2001
From: Alexandre BRACH <alexandre.brach@gmail.com>
Date: Fri, 17 May 2019 15:09:56 +0200
Subject: [PATCH] Dockerfile optimisation and add warning on WIP docker on
 README

---
 Dockerfile       | 33 ++++++++++++++++-----------------
 Dockerfile-nginx |  7 -------
 README.md        |  2 ++
 3 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100644 Dockerfile-nginx

diff --git a/Dockerfile b/Dockerfile
index c0ea67e61b..0d36bb9131 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,34 +65,35 @@ RUN mkdir /entrypoint /var/alchemy \
     && mkdir -p /home/app/.composer \
     && chown -R app: /home/app /var/alchemy
 
-
 ADD ./docker/phraseanet/ /
 
 WORKDIR /var/alchemy/
 
-COPY config /var/alchemy/config
-COPY grammar /var/alchemy/grammar
-COPY lib /var/alchemy/lib
-COPY resources /var/alchemy/resources
-COPY templates-profiler /var/alchemy/templates-profiler
-COPY templates /var/alchemy/templates
-COPY tests /var/alchemy/tests
-COPY tmp /var/alchemy/tmp
-COPY www /var/alchemy/www
-COPY composer.json /var/alchemy/
-COPY composer.lock /var/alchemy/
 COPY gulpfile.js /var/alchemy/
 COPY Makefile /var/alchemy/
 COPY package.json /var/alchemy/
 COPY phpunit.xml.dist /var/alchemy/
 COPY yarn.lock /var/alchemy/
+COPY bin /var/alchemy/bin
+COPY composer.json /var/alchemy/
+COPY composer.lock /var/alchemy/
 RUN make install_composer
+COPY resources /var/alchemy/resources
+COPY www /var/alchemy/www
 RUN make clean_assets
 RUN make install_asset_dependencies
 RUN make install_assets
 
-FROM php:7.1-fpm-stretch as phraseanet
+COPY lib /var/alchemy/lib
+COPY tmp /var/alchemy/tmp
+COPY config /var/alchemy/config
+COPY grammar /var/alchemy/grammar
+COPY templates-profiler /var/alchemy/templates-profiler
+COPY templates /var/alchemy/templates
+COPY tests /var/alchemy/tests
 
+# Phraseanet
+FROM php:7.1-fpm-stretch as phraseanet
 RUN apt-get update \
     && apt-get install -y \
         apt-transport-https \
@@ -137,15 +138,13 @@ RUN apt-get update \
 RUN mkdir -p /var/alchemy/logs && chmod 777 /var/alchemy/logs \
     && mkdir -p /var/alchemy/cache && chmod 777 /var/alchemy/cache
 COPY --from=builder [^(www)] /var/alchemy /var/alchemy
-
+WORKDIR /var/alchemy/
 CMD ["php-fpm"]
 
+# phraseanet-nginx
 FROM nginx:1.15 as phraseanet-nginx
-
 RUN useradd -u 1000 app
-
 ADD ./docker/nginx/ /
-
 COPY --from=builder /var/alchemy/www /var/alchemy/Phraseanet/www
 
 
diff --git a/Dockerfile-nginx b/Dockerfile-nginx
deleted file mode 100644
index 44c2199d58..0000000000
--- a/Dockerfile-nginx
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM nginx:1.15
-
-RUN useradd -u 1000 app
-
-ADD ./docker/nginx/ /
-
-COPY www /var/alchemy/Phraseanet/
diff --git a/README.md b/README.md
index 6f0d5c38b5..ac7c1d9c87 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,8 @@ Phraseanet is licensed under GPL-v3 license.
 
 # Docker build
 
+WARNING : still in a work-in-progress status and can be used only for test purposes.
+
 The docker distribution come with 2 differents containers :
 * an nginx that act as the front http server.
 * the php-fpm who serves the php files through nginx.