Nodejs express - optimize copy for buildah (#680)

* nodejs - Optimize copy in Dockerfile * Optimize copy for buildah Optimize copy for buildah * nodejs-express: review comments * review comments * adding comments to explain the change * Update Dockerfile * Addressed review comments * Updated package.json * Update Dockerfile Co-authored-by: Kamran Shamsi <45264227+Kamran64@users.noreply.github.com>
appsody · Mar 3, 2020 · d084263 · d084263
1 parent c27fffd
commit d084263
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/incubator/nodejs-express/image/project/Dockerfile b/incubator/nodejs-express/image/project/Dockerfile
@@ -7,16 +7,23 @@ 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 package*.json /project/
+COPY *.js /project/
+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 stack dependencies
 WORKDIR /project
-COPY ./package*.json ./
 RUN npm install --production
 
 # Install user-app dependencies
 WORKDIR /project/user-app
-COPY ./user-app/package*.json ./
 RUN npm install --production
-WORKDIR /project/user-app/node_modules
+
+# 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
@@ -27,14 +34,9 @@ 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/node_modules /project/node_modules
-COPY --chown=node:node --from=0 /project/user-app/node_modules /project/user-app/node_modules
-
-WORKDIR /project
+# 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
 
 ENV NODE_PATH=/project/user-app/node_modules
 

diff --git a/incubator/nodejs-express/image/project/package.json b/incubator/nodejs-express/image/project/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodejs-express",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Node.js Express Stack",
   "license": "Apache-2.0",
   "repository": {

diff --git a/incubator/nodejs-express/stack.yaml b/incubator/nodejs-express/stack.yaml
@@ -1,5 +1,5 @@
 name: Node.js Express
-version: 0.4.2
+version: 0.4.3
 description: Express web framework for Node.js
 license: Apache-2.0
 language: nodejs