diff options
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/ci/ci.sh | 2 | ||||
| -rw-r--r-- | devtools/docker/compose.yaml (renamed from devtools/docker/docker-compose.yaml) | 0 | ||||
| -rwxr-xr-x | devtools/nodejs.sh | 2 | ||||
| -rwxr-xr-x | devtools/recreate_db.sh | 8 | ||||
| -rwxr-xr-x | devtools/run_e2e.sh | 20 |
5 files changed, 16 insertions, 16 deletions
diff --git a/devtools/ci/ci.sh b/devtools/ci/ci.sh index c91d7b9d..ffa276cb 100755 --- a/devtools/ci/ci.sh +++ b/devtools/ci/ci.sh @@ -96,7 +96,7 @@ print_duration_and_reset echo "----------------------------------------" echo "Running all.bash" echo "----------------------------------------" -docker-compose -f devtools/docker/docker-compose.yaml run allbash ci +docker-compose -f devtools/docker/compose.yaml run allbash ci print_duration_and_reset echo "----------------------------------------" diff --git a/devtools/docker/docker-compose.yaml b/devtools/docker/compose.yaml index cc7038c6..cc7038c6 100644 --- a/devtools/docker/docker-compose.yaml +++ b/devtools/docker/compose.yaml diff --git a/devtools/nodejs.sh b/devtools/nodejs.sh index 0795eab5..2e5f4443 100755 --- a/devtools/nodejs.sh +++ b/devtools/nodejs.sh @@ -10,4 +10,4 @@ set -e # It passes env variables for e2e tests, # mounts the pwd into a volume in the container at /pkgsite, # and sets the working directory in the container to /pkgsite. -docker-compose -f devtools/docker/docker-compose.yaml run nodejs $@ +docker-compose -f devtools/docker/compose.yaml run nodejs $@ diff --git a/devtools/recreate_db.sh b/devtools/recreate_db.sh index 196e7df4..25e9dfd3 100755 --- a/devtools/recreate_db.sh +++ b/devtools/recreate_db.sh @@ -8,7 +8,7 @@ source devtools/lib.sh || { echo "Are you at repo root?"; exit 1; } -docker-compose -f devtools/docker/docker-compose.yaml stop -docker-compose -f devtools/docker/docker-compose.yaml down --remove-orphans -docker-compose -f devtools/docker/docker-compose.yaml up -d db -docker-compose -f devtools/docker/docker-compose.yaml run migrate +docker-compose -f devtools/docker/compose.yaml stop +docker-compose -f devtools/docker/compose.yaml down --remove-orphans +docker-compose -f devtools/docker/compose.yaml up -d db +docker-compose -f devtools/docker/compose.yaml run migrate diff --git a/devtools/run_e2e.sh b/devtools/run_e2e.sh index 2bddf35c..a0800cdf 100755 --- a/devtools/run_e2e.sh +++ b/devtools/run_e2e.sh @@ -5,28 +5,28 @@ # license that can be found in the LICENSE file. cleanup() { - docker-compose -f devtools/docker/docker-compose.yaml down --remove-orphans + docker-compose -f devtools/docker/compose.yaml down --remove-orphans } error() { echo "" echo "---------- ERROR: docker-compose db logs ----------" - docker-compose -f devtools/docker/docker-compose.yaml logs db + docker-compose -f devtools/docker/compose.yaml logs db echo "" echo "---------- ERROR: docker-compose migrate logs ----------" - docker-compose -f devtools/docker/docker-compose.yaml logs migrate + docker-compose -f devtools/docker/compose.yaml logs migrate echo "" echo "---------- ERROR: docker-compose seeddb logs ----------" - docker-compose -f devtools/docker/docker-compose.yaml logs seeddb + docker-compose -f devtools/docker/compose.yaml logs seeddb echo "" echo "---------- ERROR: docker-compose frontend logs ----------" - docker-compose -f devtools/docker/docker-compose.yaml logs frontend + docker-compose -f devtools/docker/compose.yaml logs frontend echo "" echo "---------- ERROR: docker-compose chrome logs ----------" - docker-compose -f devtools/docker/docker-compose.yaml logs chrome + docker-compose -f devtools/docker/compose.yaml logs chrome echo "" echo "---------- ERROR: docker-compose e2e logs ----------" - docker-compose -f devtools/docker/docker-compose.yaml logs e2e + docker-compose -f devtools/docker/compose.yaml logs e2e cleanup } @@ -42,9 +42,9 @@ main() { done export GO_DISCOVERY_SEED_DB_FILE=e2e_test_modules.txt - docker-compose -f devtools/docker/docker-compose.yaml build && - docker-compose -f devtools/docker/docker-compose.yaml run seeddb && - docker-compose -f devtools/docker/docker-compose.yaml run e2e $files $@ + docker-compose -f devtools/docker/compose.yaml build && + docker-compose -f devtools/docker/compose.yaml run seeddb && + docker-compose -f devtools/docker/compose.yaml run e2e $files $@ local status=$? if [ $status -eq 0 ] |