Skip to content

Commit e97ab53

Browse files
committed
fix docker compose
1 parent e8c774c commit e97ab53

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/_geonode-build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
du -sh /tmp/.buildx-cache || true
3232
3333
- name: Start stack
34-
run: docker-compose --env-file .env_test -f docker-compose-test.yml up -d
34+
run: docker compose --env-file .env_test -f docker-compose-test.yml up -d
3535

3636
- name: Wait for services
3737
run: |
@@ -56,19 +56,19 @@ jobs:
5656
- name: Run tests
5757
if: ${{ inputs.test_suite != '' }}
5858
run: |
59-
docker-compose --env-file .env_test -f docker-compose-test.yml exec db psql -U postgres -c 'SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid();'
60-
docker-compose --env-file .env_test -f docker-compose-test.yml exec db createdb -U postgres -T postgres test_postgres
61-
docker-compose --env-file .env_test -f docker-compose-test.yml exec db createdb -U postgres -T postgres test_geonode
62-
docker-compose --env-file .env_test -f docker-compose-test.yml exec db createdb -U postgres -T postgres test_geonode_data
63-
docker-compose --env-file .env_test -f docker-compose-test.yml exec db psql -U postgres -d test_geonode -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
64-
docker-compose --env-file .env_test -f docker-compose-test.yml exec db psql -U postgres -d test_geonode_data -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
65-
docker-compose --env-file .env_test -f docker-compose-test.yml exec django bash -c "${{ inputs.test_suite }}"
59+
docker compose --env-file .env_test -f docker-compose-test.yml exec db psql -U postgres -c 'SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid();'
60+
docker compose --env-file .env_test -f docker-compose-test.yml exec db createdb -U postgres -T postgres test_postgres
61+
docker compose --env-file .env_test -f docker-compose-test.yml exec db createdb -U postgres -T postgres test_geonode
62+
docker compose --env-file .env_test -f docker-compose-test.yml exec db createdb -U postgres -T postgres test_geonode_data
63+
docker compose --env-file .env_test -f docker-compose-test.yml exec db psql -U postgres -d test_geonode -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
64+
docker compose --env-file .env_test -f docker-compose-test.yml exec db psql -U postgres -d test_geonode_data -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
65+
docker compose --env-file .env_test -f docker-compose-test.yml exec django bash -c "${{ inputs.test_suite }}"
6666
timeout-minutes: 10
6767

6868
- name: Upload to Codecov
6969
if: ${{ inputs.test_suite != '' }}
7070
run: |
71-
docker-compose --env-file .env_test -f docker-compose-test.yml exec django bash -c \
71+
docker compose --env-file .env_test -f docker-compose-test.yml exec django bash -c \
7272
"bash <(curl -s https://codecov.io/bash) -t 2c0e7780-1640-45f0-93a3-e103b057d8c8 -F ${{ inputs.codecov_name }}"
7373
7474
- name: Debug logs
@@ -81,4 +81,4 @@ jobs:
8181
8282
- name: Stop the stack
8383
if: always()
84-
run: docker-compose --env-file .env_test -f docker-compose-test.yml down -v
84+
run: docker compose --env-file .env_test -f docker-compose-test.yml down -v

0 commit comments

Comments
 (0)