X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=docker%2Falpine%2FDockerfile.master;h=7bbe1fb77f66e46afdc80906ba2c0f6fe9a5a08b;hb=7cf436cea4d05fe667c479be8b909c55c3f1da40;hp=9cb4dec49565d34337051088e43e0fcffed98b3d;hpb=b70436373b488ce9cd8b0dc287d058b5ca206347;p=github%2Fshaarli%2FShaarli.git

diff --git a/docker/alpine/Dockerfile.master b/docker/alpine/Dockerfile.master
index 9cb4dec4..7bbe1fb7 100644
--- a/docker/alpine/Dockerfile.master
+++ b/docker/alpine/Dockerfile.master
@@ -8,6 +8,15 @@ RUN curl -L https://github.com/shaarli/Shaarli/archive/master.tar.gz | tar xzf -
     && composer --prefer-dist --no-dev install
 
 # Stage 2:
+# - Frontend dependencies
+FROM node:9.9-alpine as node
+COPY --from=composer /app/shaarli shaarli
+RUN cd shaarli \
+    && yarn install \
+    && yarn run build \
+    && rm -rf node_modules
+
+# Stage 3:
 # - Shaarli image
 FROM alpine:3.6
 LABEL maintainer="Shaarli Community"
@@ -40,9 +49,12 @@ RUN rm -rf /etc/php7/php-fpm.d/www.conf \
 
 
 WORKDIR /var/www
-COPY --from=composer /app/shaarli shaarli
+COPY --from=node /shaarli shaarli
+
+RUN chown -R nginx:nginx . \
+    && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
+    && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
 
-RUN chown -R nginx:nginx .
 VOLUME /var/www/shaarli/data
 
 EXPOSE 80