Fix cloud build and dockerfiles to include common directory

nielm · Dec 12, 2023 · d477594 · d477594
1 parent de90fb8
commit d477594
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/src/Dockerfile b/src/Dockerfile
@@ -25,4 +25,4 @@ FROM gcr.io/distroless/nodejs${NODE_VERSION}:latest
 COPY --from=build-env /usr/src/app /usr/src/app
 WORKDIR /usr/src/app/scaler/scaler-core
 
-CMD ["../../index.js"]
+CMD ["-e", "require('../../index').main()"]
diff --git a/src/index.js b/src/index.js
@@ -15,8 +15,6 @@
 
 const pollerCore = require('./poller/poller-core');
 const scalerCore = require('./scaler/scaler-core');
-const poller = require('./poller');
-const scaler = require('./scaler');
 const {logger} = require('./autoscaler-common/logger');
 const yaml = require('js-yaml');
 const fs = require('fs/promises');
@@ -63,7 +61,5 @@ async function main() {
 module.exports = {
   ...scalerCore,
   ...pollerCore,
-  pollerMain: poller.main,
-  scalerMain: scaler.main,
-  autoscalerMain: main,
+  main,
 };
diff --git a/src/poller/Dockerfile b/src/poller/Dockerfile
@@ -16,7 +16,7 @@ ARG NODE_VERSION=18
 FROM node:${NODE_VERSION}-alpine AS build-env
 
 WORKDIR /usr/src/app
-COPY .. .
+COPY --from=srcRoot autoscaler-common/ scaler/ ./
 
 RUN npm config set update-notifier false
 RUN npm install
@@ -25,4 +25,4 @@ FROM gcr.io/distroless/nodejs${NODE_VERSION}:latest
 COPY --from=build-env /usr/src/app /usr/src/app
 WORKDIR /usr/src/app/poller/poller-core
 
-CMD ["../index.js"]
+CMD ["-e", "require('../index').main()"]
diff --git a/src/poller/cloudbuild.yaml b/src/poller/cloudbuild.yaml
@@ -14,5 +14,6 @@
 
 steps:
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['build', '--tag=$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/poller', '.']
+  dir: '../'
+  args: ['build', '--tag=$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler', '--build-context' 'srcRoot=.' 'poller/']
 images: ['$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/poller']
diff --git a/src/scaler/Dockerfile b/src/scaler/Dockerfile
@@ -16,7 +16,7 @@ ARG NODE_VERSION=18
 FROM node:${NODE_VERSION}-alpine AS build-env
 
 WORKDIR /usr/src/app
-COPY .. .
+COPY --from=srcRoot autoscaler-common/ scaler/ ./
 
 RUN npm config set update-notifier false
 RUN npm install
@@ -25,4 +25,4 @@ FROM gcr.io/distroless/nodejs${NODE_VERSION}:latest
 COPY --from=build-env /usr/src/app /usr/src/app
 WORKDIR /usr/src/app/scaler/scaler-core
 
-CMD ["../index.js"]
+CMD ["-e", "require('../index').main()"]
diff --git a/src/scaler/cloudbuild.yaml b/src/scaler/cloudbuild.yaml
@@ -14,5 +14,6 @@
 
 steps:
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['build', '--tag=$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler', '.']
+  dir: '../'
+  args: ['build', '--tag=$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler', '--build-context' 'srcRoot=.' 'scaler/']
 images: ['$LOCATION-docker.pkg.dev/$PROJECT_ID/spanner-autoscaler/scaler']