diff options
| author | Michael Matloob <matloob@golang.org> | 2023-12-21 15:55:28 -0500 |
|---|---|---|
| committer | Michael Matloob <matloob@golang.org> | 2023-12-24 13:03:50 +0000 |
| commit | 475d4c57676e9e93276be3b802aaa7e758610ead (patch) | |
| tree | 8613a26a7d08440e05e56441cd5c16424c101fab /devtools/docker | |
| parent | aba46575e3dd28ef561296a836a89b1354774e39 (diff) | |
| download | go-x-pkgsite-475d4c57676e9e93276be3b802aaa7e758610ead.tar.xz | |
third_party/wait-for-it: replace with a simple go program
The program doesn't have all the features of wait-for-it, but it
implements the core functionality we need.
For golang/go#61399
Change-Id: Ia5498523e44b74dcd5af1c984521f1a46208d2c5
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/552295
kokoro-CI: kokoro <noreply+kokoro@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
Diffstat (limited to 'devtools/docker')
| -rw-r--r-- | devtools/docker/compose.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/devtools/docker/compose.yaml b/devtools/docker/compose.yaml index adeb54bc..c6bb7131 100644 --- a/devtools/docker/compose.yaml +++ b/devtools/docker/compose.yaml @@ -38,7 +38,7 @@ services: # TERM is set to xterm-256color for use by devtools/lib.sh. TERM: xterm-256color WAITFORIT_TIMEOUT: 300 - entrypoint: ./third_party/wait-for-it/wait-for-it.sh db:5432 -- ./all.bash + entrypoint: go run ./devtools/cmd/wait_available db:5432 -- ./all.bash volumes: - ../../:/pkgsite working_dir: /pkgsite @@ -49,7 +49,7 @@ services: environment: <<: [*database-variables, *go-variables] WAITFORIT_TIMEOUT: 300 - entrypoint: ./third_party/wait-for-it/wait-for-it.sh frontend:8080 -- go run + entrypoint: go run ./devtools/cmd/wait_available frontend:8080 -- go run command: "tests/search/main.go -frontend http://frontend:8080" volumes: - ../../:/pkgsite @@ -61,7 +61,7 @@ services: environment: <<: *go-variables WAITFORIT_TIMEOUT: 300 - entrypoint: ./third_party/wait-for-it/wait-for-it.sh frontend:8080 -- go run + entrypoint: go run ./devtools/cmd/wait_available frontend:8080 -- go run command: "tests/api/main.go -frontend http://frontend:8080 -all compare " volumes: - ../../:/pkgsite @@ -72,7 +72,7 @@ services: depends_on: - db command: bash -c " - ./third_party/wait-for-it/wait-for-it.sh db:5432 -- + go run ./devtools/cmd/wait_available db:5432 -- go run ./devtools/cmd/db/main.go create && go run ./devtools/cmd/db/main.go migrate && go run ./cmd/frontend -host=0.0.0.0:8080" @@ -94,7 +94,7 @@ services: # time seeddb runs. If this ends up being flaky, we should add a check here. command: bash -c " echo GO_DISCOVERY_CONFIG_DYNAMIC=$GO_DISCOVERY_CONFIG_DYNAMIC && - ./third_party/wait-for-it/wait-for-it.sh db:5432 -- + go run ./devtools/cmd/wait_available db:5432 -- go run ./devtools/cmd/db/main.go create && go run ./devtools/cmd/db/main.go migrate && go run ./devtools/cmd/seeddb/main.go -seed ${GO_DISCOVERY_SEED_DB_FILE:-seed.txt}" |