From: ArthurHoaro <arthur@hoa.ro>
Date: Wed, 28 Mar 2018 17:08:32 +0000 (+0200)
Subject: Merge pull request #1113 from ArthurHoaro/docker/node-yarn-webpack
X-Git-Tag: v0.10.0~35
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ed6d1a7b80283b41bb61f44b543ea8d96172f045;hp=c81f1afc0a3a16daf98741a63c7524b27835da99;p=github%2Fshaarli%2FShaarli.git

Merge pull request #1113 from ArthurHoaro/docker/node-yarn-webpack

Docker: build frontend dependencies with node and yarn
---

diff --git a/docker/alpine/Dockerfile.master b/docker/alpine/Dockerfile.master
index 0472947f..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,7 +49,7 @@ 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 \