diff options
| author | Hana (Hyang-Ah) Kim <hyangah@gmail.com> | 2024-01-12 11:18:52 -0500 |
|---|---|---|
| committer | Jonathan Amsterdam <jba@google.com> | 2024-01-17 19:20:10 +0000 |
| commit | f8a3afac97060555265ab0813cbfa32566348d87 (patch) | |
| tree | 620577c6d2306818e2a3bac07d7c1e79e442ad38 /devtools | |
| parent | ef00dbe368000f3385ff3d3766ce50e6d09cbab9 (diff) | |
| download | go-x-pkgsite-f8a3afac97060555265ab0813cbfa32566348d87.tar.xz | |
deploy: use `docker compose` (V2)
It also replaces the custom docker-compose container image
with the gcr.io/cloud-builders/docker, that includes docker compose
and maintained.
$ docker run -it gcr.io/cloud-builders/docker compose version
Docker Compose version v2.21.0
Change-Id: I44900df9fb9adeda0b7a7646007b61d52d1db394
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/555997
kokoro-CI: kokoro <noreply+kokoro@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/ci/ci.sh | 2 | ||||
| -rw-r--r-- | devtools/docker.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/devtools/ci/ci.sh b/devtools/ci/ci.sh index 5169af28..2f6bdbb1 100755 --- a/devtools/ci/ci.sh +++ b/devtools/ci/ci.sh @@ -19,7 +19,7 @@ export CI=true # Skip installing chrome with puppeteer. We are using the browserless/chrome # docker image instead. export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true -# Set the database name to be used in docker-compose. +# Set the database name to be used in docker compose. export GO_DISCOVERY_DATABASE_NAME=discovery_ci_test # starttime is the start time for this entire script. diff --git a/devtools/docker.sh b/devtools/docker.sh index c0adf5c5..a71d9e04 100644 --- a/devtools/docker.sh +++ b/devtools/docker.sh @@ -35,5 +35,5 @@ docker_error() { } dockercompose() { - docker-compose -f devtools/docker/compose.yaml $@ + docker compose -f devtools/docker/compose.yaml $@ } |