nodejs - Optimize copy for buildah (#679)

* nodejs - Optimize copy in Dockerfile * Added comments * Update Dockerfile * Update Dockerfile * Reworked to move copy user-app in first stage * Update package.json * Update Dockerfile * Update Dockerfile
appsody · Mar 3, 2020 · c27fffd · c27fffd
1 parent 6ceac5f
commit c27fffd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/incubator/nodejs/image/project/Dockerfile b/incubator/nodejs/image/project/Dockerfile
@@ -7,11 +7,17 @@ RUN apt-get update \
  && apt-get clean \
  && echo 'Finished installing dependencies'
 
+# Copying individual files/folders as buildah 1.9.0 does not honour .dockerignore
+COPY user-app /project/user-app
+# Removing node_modules as we can not make assumptions about file structure of user-app
+RUN rm -rf /project/user-app/node_modules && mkdir -p /project/user-app/node_modules
+
 # Install user-app dependencies
-WORKDIR "/project/user-app"
-COPY ./user-app/package*.json ./
-RUN npm install --production
-WORKDIR "/project/user-app/node_modules"
+WORKDIR /project/user-app
+RUN npm install --production 
+
+# Creating a tar to work around poor copy performance when using buildah 1.9.0
+RUN cd / && tar czf project.tgz project
 
 # Copy the dependencies into a slim Node docker image
 FROM node:12-slim
@@ -22,16 +28,14 @@ RUN apt-get update \
  && apt-get clean \
  && echo 'Finished installing dependencies'
 
-# Copy the project
-COPY --chown=node:node . /project
-
-# Copy all dependencies
-COPY --chown=node:node --from=0 /project/user-app/node_modules /project/user-app/node_modules
+# Copy project with dependencies
+COPY --chown=node:node --from=0 /project.tgz .
+RUN tar xf project.tgz && chown -R node:node project && rm project.tgz
 
-WORKDIR "/project/user-app"
+WORKDIR /project/user-app
 
 ENV NODE_ENV production
 
 USER node
 
-CMD ["npm", "start"]
+CMD ["npm", "start"]
diff --git a/incubator/nodejs/image/project/package.json b/incubator/nodejs/image/project/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodejs",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Node.js Stack",
   "license": "Apache-2.0",
   "repository": {

diff --git a/incubator/nodejs/stack.yaml b/incubator/nodejs/stack.yaml
@@ -1,5 +1,5 @@
 name: Node.js
-version: 0.3.3
+version: 0.3.4
 description: Runtime for Node.js applications
 license: Apache-2.0
 language: nodejs