Fix container build commands to allow use of common code

nielm · Dec 13, 2023 · 1ce4b3d · 1ce4b3d
1 parent d477594
commit 1ce4b3d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/src/poller/Dockerfile → src/Dockerfile-poller b/src/poller/Dockerfile → src/Dockerfile-poller
@@ -16,10 +16,15 @@ ARG NODE_VERSION=18
 FROM node:${NODE_VERSION}-alpine AS build-env
 
 WORKDIR /usr/src/app
-COPY --from=srcRoot autoscaler-common/ scaler/ ./
+COPY autoscaler-common/ autoscaler-common/
+COPY poller/ poller/
 
+WORKDIR /usr/src/app/autoscaler-common
 RUN npm config set update-notifier false
-RUN npm install
+RUN npm install --omit=dev
+
+WORKDIR /usr/src/app/poller
+RUN npm install --omit=dev
 
 FROM gcr.io/distroless/nodejs${NODE_VERSION}:latest
 COPY --from=build-env /usr/src/app /usr/src/app

diff --git a/src/scaler/Dockerfile → src/Dockerfile-scaler b/src/scaler/Dockerfile → src/Dockerfile-scaler
@@ -16,10 +16,15 @@ ARG NODE_VERSION=18
 FROM node:${NODE_VERSION}-alpine AS build-env
 
 WORKDIR /usr/src/app
-COPY --from=srcRoot autoscaler-common/ scaler/ ./
+COPY autoscaler-common/ autoscaler-common/
+COPY scaler/ scaler/
 
+WORKDIR /usr/src/app/autoscaler-common
 RUN npm config set update-notifier false
-RUN npm install
+RUN npm install  --omit=dev
+
+WORKDIR /usr/src/app/scaler
+RUN npm install  --omit=dev
 
 FROM gcr.io/distroless/nodejs${NODE_VERSION}:latest
 COPY --from=build-env /usr/src/app /usr/src/app

diff --git a/src/Dockerfile → src/Dockerfile-unifed b/src/Dockerfile → src/Dockerfile-unifed
@@ -19,7 +19,7 @@ WORKDIR /usr/src/app
 COPY . .
 
 RUN npm config set update-notifier false
-RUN npm install
+RUN npm install  --omit=dev
 
 FROM gcr.io/distroless/nodejs${NODE_VERSION}:latest
 COPY --from=build-env /usr/src/app /usr/src/app

diff --git a/src/poller/cloudbuild.yaml → src/cloudbuild-poller.yaml b/src/poller/cloudbuild.yaml → src/cloudbuild-poller.yaml
@@ -14,6 +14,5 @@
 
 steps:
 - name: 'gcr.io/cloud-builders/docker'
-  dir: '../'
-  args: ['build', '--tag=$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler', '--build-context' 'srcRoot=.' 'poller/']
+  args: ['build', '--tag=$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/poller', '-f', 'Dockerfile-poller', '.']
 images: ['$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/poller']
diff --git a/src/cloudbuild.yaml → src/cloudbuild-scaler.yaml b/src/cloudbuild.yaml → src/cloudbuild-scaler.yaml
@@ -14,5 +14,5 @@
 
 steps:
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['build', '--tag=$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler', '.']
+  args: ['build', '--tag=$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler', '-f', 'Dockerfile-scaler', '.']
 images: ['$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler']
diff --git a/src/scaler/cloudbuild.yaml → src/cloudbuild-unified.yaml b/src/scaler/cloudbuild.yaml → src/cloudbuild-unified.yaml
@@ -14,6 +14,5 @@
 
 steps:
 - name: 'gcr.io/cloud-builders/docker'
-  dir: '../'
-  args: ['build', '--tag=$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler', '--build-context' 'srcRoot=.' 'scaler/']
+  args: ['build', '--tag=$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler', '-f', 'Dockerfile-unified', '.']
 images: ['$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler']