do clean installs

see: remix-run/blues-stack#184
fly-apps · May 8, 2023 · 2ac51de · 2ac51de
1 parent e8cfad5
commit 2ac51de
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 13 deletions.
diff --git a/gdf.js b/gdf.js
@@ -129,6 +129,22 @@ export class GDF {
   get packagerInstall() {
     let install = `${this.packager} install`
 
+    const packageFiles = this.packageFiles
+
+    // clean install
+    if (this.packager === 'npm' && packageFiles.includes('package-lock.json')) {
+      install = 'npm ci'
+    } else if (packageFiles.includes('yarn.lock')) {
+      if (this.yarnVersion.startsWith('1.')) {
+        install += ' --frozen-lockfile'
+      } else {
+        install += ' --immutable --immutable-cache --check-cache'
+      }
+    } else if (packageFiles.includes('pnpm-lock.yaml')) {
+      install += ' --frozen-lockfile'
+    }
+
+    // optionally include dev dependencies
     if (this.devDependencies && !this.pnpm) {
       if (this.yarn) {
         install += ' --production=false'
@@ -137,6 +153,7 @@ export class GDF {
       }
     }
 
+    // optionally include legacy peer dependencies
     if (this.options.legacyPeerDeps) {
       if (this.npm) {
         install += ' --legacy-peer-deps'

diff --git a/test/express/Dockerfile b/test/express/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1.4
 
 # Adjust NODE_VERSION as desired
-ARG NODE_VERSION=20.0.0
+ARG NODE_VERSION=xxx
 FROM node:${NODE_VERSION}-slim as base
 
 LABEL fly_launch_runtime="Node.js"
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json package-lock.json ./
-RUN npm install
+RUN npm ci
 
 # Copy application code
 COPY --link . .

diff --git a/test/fastify/Dockerfile b/test/fastify/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json package-lock.json ./
-RUN npm install --include=dev
+RUN npm ci --include=dev
 
 # Copy application code
 COPY --link . .

diff --git a/test/gatsby/Dockerfile b/test/gatsby/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json package-lock.json ./
-RUN npm install
+RUN npm ci
 
 # Copy application code
 COPY --link . .

diff --git a/test/legacy-peer-deps/Dockerfile b/test/legacy-peer-deps/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json package-lock.json ./
-RUN npm install --include=dev --legacy-peer-deps
+RUN npm ci --include=dev --legacy-peer-deps
 
 # Copy application code
 COPY --link . .

diff --git a/test/nest/Dockerfile b/test/nest/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json package-lock.json ./
-RUN npm install --include=dev
+RUN npm ci --include=dev
 
 # Copy application code
 COPY --link . .

diff --git a/test/next-npm/Dockerfile b/test/next-npm/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json package-lock.json ./
-RUN npm install
+RUN npm ci
 
 # Copy application code
 COPY --link . .

diff --git a/test/next-pnpm/Dockerfile b/test/next-pnpm/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json pnpm-lock.yaml ./
-RUN pnpm install
+RUN pnpm install --frozen-lockfile
 
 # Copy application code
 COPY --link . .

diff --git a/test/next-yarn/Dockerfile b/test/next-yarn/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json yarn.lock ./
-RUN yarn install
+RUN yarn install --frozen-lockfile
 
 # Copy application code
 COPY --link . .

diff --git a/test/nuxt/Dockerfile b/test/nuxt/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json yarn.lock ./
-RUN yarn install --production=false
+RUN yarn install --frozen-lockfile --production=false
 
 # Copy application code
 COPY --link . .

diff --git a/test/remix-indie/Dockerfile b/test/remix-indie/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json package-lock.json ./
-RUN npm install --include=dev
+RUN npm ci --include=dev
 
 # Generate Prisma Client
 COPY --link prisma .

diff --git a/test/swap/Dockerfile b/test/swap/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json package-lock.json ./
-RUN npm install
+RUN npm ci
 
 # Copy application code
 COPY --link . .

diff --git a/test/windows/Dockerfile b/test/windows/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
 
 # Install node modules
 COPY --link package.json package-lock.json ./
-RUN npm install --include=dev
+RUN npm ci --include=dev
 
 # Generate Prisma Client
 COPY --link prisma .