Merge pull request #3038 from AlexandreBrach/PHRAS-2540-docker-compose

PHRAS-2540 #comment Dockerfile optimisation and add warning on WIP docker on README
This commit is contained in:
Nicolas Maillat
2019-05-17 16:00:33 +02:00
committed by GitHub
3 changed files with 18 additions and 24 deletions

View File

@@ -65,34 +65,35 @@ RUN mkdir /entrypoint /var/alchemy \
&& mkdir -p /home/app/.composer \ && mkdir -p /home/app/.composer \
&& chown -R app: /home/app /var/alchemy && chown -R app: /home/app /var/alchemy
ADD ./docker/phraseanet/ / ADD ./docker/phraseanet/ /
WORKDIR /var/alchemy/ 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 gulpfile.js /var/alchemy/
COPY Makefile /var/alchemy/ COPY Makefile /var/alchemy/
COPY package.json /var/alchemy/ COPY package.json /var/alchemy/
COPY phpunit.xml.dist /var/alchemy/ COPY phpunit.xml.dist /var/alchemy/
COPY yarn.lock /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 RUN make install_composer
COPY resources /var/alchemy/resources
COPY www /var/alchemy/www
RUN make clean_assets RUN make clean_assets
RUN make install_asset_dependencies RUN make install_asset_dependencies
RUN make install_assets 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 \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
apt-transport-https \ apt-transport-https \
@@ -137,15 +138,13 @@ RUN apt-get update \
RUN mkdir -p /var/alchemy/logs && chmod 777 /var/alchemy/logs \ RUN mkdir -p /var/alchemy/logs && chmod 777 /var/alchemy/logs \
&& mkdir -p /var/alchemy/cache && chmod 777 /var/alchemy/cache && mkdir -p /var/alchemy/cache && chmod 777 /var/alchemy/cache
COPY --from=builder [^(www)] /var/alchemy /var/alchemy COPY --from=builder [^(www)] /var/alchemy /var/alchemy
WORKDIR /var/alchemy/
CMD ["php-fpm"] CMD ["php-fpm"]
# phraseanet-nginx
FROM nginx:1.15 as phraseanet-nginx FROM nginx:1.15 as phraseanet-nginx
RUN useradd -u 1000 app RUN useradd -u 1000 app
ADD ./docker/nginx/ / ADD ./docker/nginx/ /
COPY --from=builder /var/alchemy/www /var/alchemy/Phraseanet/www COPY --from=builder /var/alchemy/www /var/alchemy/Phraseanet/www

View File

@@ -1,7 +0,0 @@
FROM nginx:1.15
RUN useradd -u 1000 app
ADD ./docker/nginx/ /
COPY www /var/alchemy/Phraseanet/

View File

@@ -45,6 +45,8 @@ Phraseanet is licensed under GPL-v3 license.
# Docker build # 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 : The docker distribution come with 2 differents containers :
* an nginx that act as the front http server. * an nginx that act as the front http server.
* the php-fpm who serves the php files through nginx. * the php-fpm who serves the php files through nginx.