commit e1b1b059a7c9ed4bed216fcc5f7c008217937352
author Jonathan Amsterdam <jba@google.com> Tue Dec 14 08:02:12 2021 -0500
committer Jonathan Amsterdam <jba@google.com> Wed Dec 15 08:17:17 2021 +0000
tree a3f71f52abb165f2625ea69554059549449d91c1
parent 88c567e0570cac49d0cbecccb7349fcb74df8c29

cmd/worker,devtools: fix Dockerfile and deploy_worker.sh

Dockerfile: rename all.bash to checks.bash

deploy_worker.sh: fix some typos

Change-Id: I120867fbfec42f7e5b35e885c8f3633885131e03
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/371597
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Julie Qiu <julie@golang.org>

cmd/worker/Dockerfile

diff --git a/cmd/worker/Dockerfile b/cmd/worker/Dockerfile
index 1e62e2b..14d19b3 100644
--- a/cmd/worker/Dockerfile
+++ b/cmd/worker/Dockerfile
@@ -14,7 +14,7 @@
 # Copy go.mod and go.sum into the container.
 # If they don't change, which is the common case, then docker can
 # cache this COPY and the subsequent RUN.
-COPY go.mod go.sum all.bash /
+COPY go.mod go.sum checks.bash /
 
 # Download the dependencies.
 RUN go mod download

devtools/deploy_worker.sh

diff --git a/devtools/deploy_worker.sh b/devtools/deploy_worker.sh
index c0ce1c2..957f983 100755
--- a/devtools/deploy_worker.sh
+++ b/devtools/deploy_worker.sh
@@ -45,12 +45,12 @@
   local image=gcr.io/$project/vuln-worker:$(docker_image_tag)
 
   $prefix docker build -t $image -f cmd/worker/Dockerfile .
-  $prefix docker pushx $image
+  $prefix docker push $image
   $prefix gcloud run deploy --quiet --project $project $env-vuln-worker --image $image
   # If there was a rollback, `gcloud run deploy` will create a revision but
   # not point traffic to it. The following command ensures that the new revision
   # will get traffic.
-  $prefix gcloud run services update-traffic $env-worker --to-latest
+  $prefix gcloud run services --project $project update-traffic $env-vuln-worker --to-latest
 }
 
 main $@