From 8367cb643e3cc0f36420d6aa3feaf60879d669c2 Mon Sep 17 00:00:00 2001
From: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date: Thu, 16 Aug 2018 17:30:14 +0200
Subject: [PATCH] Attempt at fixing docker build /cc @kiloreux

---
 packages/@uppy/companion/.dockerignore |  1 +
 packages/@uppy/companion/Dockerfile    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 packages/@uppy/companion/.dockerignore

diff --git a/packages/@uppy/companion/.dockerignore b/packages/@uppy/companion/.dockerignore
new file mode 100644
index 000000000..b512c09d4
--- /dev/null
+++ b/packages/@uppy/companion/.dockerignore
@@ -0,0 +1 @@
+node_modules
\ No newline at end of file
diff --git a/packages/@uppy/companion/Dockerfile b/packages/@uppy/companion/Dockerfile
index 111543fc1..ad3c6ef5b 100644
--- a/packages/@uppy/companion/Dockerfile
+++ b/packages/@uppy/companion/Dockerfile
@@ -1,21 +1,21 @@
-FROM alpine:3.6
-
-RUN apk add --update nodejs \
-	           nodejs-npm 
+FROM node:8.11.4-alpine
 
 COPY package.json /app/package.json
 
 WORKDIR /app
 
-RUN apk --update add  --virtual native-dep \
+# Install node_modules
+# * to optionally copy lock files that _might_ _not_ exist
+ADD package.json package-*.json yarn.* /tmp/
+RUN cd /tmp && apk --update add  --virtual native-dep \
   make gcc g++ python libgcc libstdc++ && \
   npm  install && \
   apk del native-dep
+RUN mkdir -p /app && cd /app && ln -nfs /tmp/node_modules
 RUN apk add bash
 COPY . /app
 ENV PATH "${PATH}:/app/node_modules/.bin"
 RUN npm run build
 CMD ["node","/app/lib/standalone/start-server.js"]
-# This can be overwritten later
-EXPOSE 3020
-
+# This can be overruled later
+EXPOSE 3020
\ No newline at end of file