Merge branch 'v0.11' into latest

[github/shaarli/Shaarli.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 10de129e82367aed684d14c224160536c19b6093..f05cf3a45ccbdb360bcb29adf370f88d46b1043c 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,11 +5,7 @@ FROM python:3-alpine as docs
 ADD . /usr/src/app/shaarli
 RUN cd /usr/src/app/shaarli \
     && pip install --no-cache-dir mkdocs \
-<<<<<<< HEAD
-    && mkdocs build
-=======
     && mkdocs build --clean
->>>>>>> v0.10.0
 
 # Stage 2:
 # - Resolve PHP dependencies with Composer
@@ -20,7 +16,7 @@ RUN cd shaarli \
 
 # Stage 3:
 # - Frontend dependencies
-FROM node:9.9-alpine as node
+FROM node:12-alpine as node
 COPY --from=composer /app/shaarli shaarli
 RUN cd shaarli \
     && yarn install \