Merge pull request #28 from CSCfi/feature/docker-update

Docker stage for frontend node.js build

Author: blankdots

Dockerfile

@@ -1,4 +1,16 @@
-FROM python:3.7-alpine3.9 as BUILD
+FROM node:12.10-alpine as FRONTEND
+
+RUN apk add --update \
+    && apk add --no-cache build-base curl-dev linux-headers bash git\
+    && rm -rf /var/cache/apk/*
+
+COPY swift_browser_ui_frontend /root/swift_ui/swift_browser_ui_frontend
+
+RUN cd /root/swift_ui/swift_browser_ui_frontend \\
+    && npm install \\
+    && npm run build
+
+FROM python:3.7-alpine3.9 as BACKEND
 
 RUN apk add --update \
     && apk add --no-cache build-base curl-dev linux-headers bash git\
@@ -8,7 +20,7 @@ RUN apk add --update \
 COPY requirements.txt /root/swift_ui/requirements.txt
 COPY setup.py /root/swift_ui/setup.py
 COPY swift_browser_ui /root/swift_ui/swift_browser_ui
-COPY swift_browser_ui_frontend /root/swift_ui/swift_browser_ui_frontend
+COPY --from=FRONTEND /root/swift_ui/swift_browser_ui_frontend/dist /root/swift_ui/swift_browser_ui_frontend/dist
 
 RUN pip install --upgrade pip && \
     pip install -r /root/swift_ui/requirements.txt && \
@@ -22,11 +34,11 @@ LABEL maintainer "CSC Developers"
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.vcs-url="https://github.com/CSCFI/swift-browser-ui"
 
-COPY --from=BUILD usr/local/lib/python3.7/ usr/local/lib/python3.7/
+COPY --from=BACKEND usr/local/lib/python3.7/ usr/local/lib/python3.7/
 
-COPY --from=BUILD /usr/local/bin/gunicorn /usr/local/bin/
+COPY --from=BACKEND /usr/local/bin/gunicorn /usr/local/bin/
 
-COPY --from=BUILD /usr/local/bin/swift-browser-ui /usr/local/bin/
+COPY --from=BACKEND /usr/local/bin/swift-browser-ui /usr/local/bin/
 
 RUN mkdir -p /app