diff options
| author | Julie Qiu <julie@golang.org> | 2021-06-17 01:44:32 -0400 |
|---|---|---|
| committer | Julie Qiu <julie@golang.org> | 2021-06-18 15:15:55 +0000 |
| commit | 2dde6d3a92915aa0aa7e336715b6e855c8a4647f (patch) | |
| tree | b8ccc174837ee748fe12b40eb8eb3050c06ac47a /devtools | |
| parent | 977edda75c10ae2a8c2189cdfa2bca2e3eca79ea (diff) | |
| download | go-x-pkgsite-2dde6d3a92915aa0aa7e336715b6e855c8a4647f.tar.xz | |
devtools/ci: use docker-compose for all.bash in CI
all.bash is now run using docker-compose in devtools/ci/ci.sh.
Change-Id: I5ed10c7ce1f5acdb010341d61f05167f9c66ba19
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/328750
Trust: Julie Qiu <julie@golang.org>
Run-TryBot: Julie Qiu <julie@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/ci/ci.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/devtools/ci/ci.sh b/devtools/ci/ci.sh index 5bbd1c3f..eb0ae5ca 100755 --- a/devtools/ci/ci.sh +++ b/devtools/ci/ci.sh @@ -92,19 +92,9 @@ echo "----------------------------------------" print_duration_and_reset echo "----------------------------------------" -echo "Running postgres" -echo "----------------------------------------" -pg_container=$(${maybe_sudo}docker run --rm -d -e LANG=C postgres:11.4) -trap "${maybe_sudo} docker stop ${pg_container}" EXIT -print_duration_and_reset - -echo "----------------------------------------" echo "Running all.bash" echo "----------------------------------------" -${maybe_sudo}docker run --rm -t \ - --network container:${pg_container} \ - -v $(pwd):"/workspace" -w "/workspace" \ - -e GO_DISCOVERY_TESTDB=true golang:1.15 ./all.bash ci +docker-compose -f devtools/docker/docker-compose.yaml run allbash ci print_duration_and_reset echo "----------------------------------------" |