From d73e7fabc3bad41825f2bfc5d5ce77accd8bae04 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 8 Aug 2024 12:54:39 +0200 Subject: [PATCH 1/2] replace docker-compose with docker compose --- .github/workflows/test_backend.yml | 4 ++-- .github/workflows/test_database.yml | 6 +++--- .github/workflows/test_dht_node.yml | 8 ++++---- .github/workflows/test_dlt_connector.yml | 4 ++-- .github/workflows/test_e2e.yml | 10 +++++----- .github/workflows/test_federation.yml | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml index b517c5186..ed20f91bb 100644 --- a/.github/workflows/test_backend.yml +++ b/.github/workflows/test_backend.yml @@ -44,14 +44,14 @@ jobs: uses: actions/checkout@v3 - name: Backend | docker-compose mariadb - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb - name: Sleep for 30 seconds run: sleep 30s shell: bash - name: Backend | docker-compose database - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database - name: Backend | Unit tests run: cd database && yarn && yarn build && cd ../backend && yarn && yarn test diff --git a/.github/workflows/test_database.yml b/.github/workflows/test_database.yml index 0444a0538..1dba8999e 100644 --- a/.github/workflows/test_database.yml +++ b/.github/workflows/test_database.yml @@ -43,13 +43,13 @@ jobs: uses: actions/checkout@v3 - name: Database | docker-compose - run: docker-compose -f docker-compose.yml up --detach mariadb + run: docker compose -f docker-compose.yml up --detach mariadb - name: Database | up - run: docker-compose -f docker-compose.yml run -T database yarn up + run: docker compose -f docker-compose.yml run -T database yarn up - name: Database | reset - run: docker-compose -f docker-compose.yml run -T database yarn reset + run: docker compose -f docker-compose.yml run -T database yarn reset lint: if: needs.files-changed.outputs.database == 'true' diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index e81ed33af..6fd24784b 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -71,15 +71,15 @@ jobs: - name: Load Docker Image run: docker load < /tmp/dht-node.tar - - name: docker-compose mariadb - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb + - name: docker compose mariadb + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb - name: Sleep for 30 seconds run: sleep 30s shell: bash - - name: docker-compose database - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database + - name: docker compose database + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database - name: Sleep for 30 seconds run: sleep 30s diff --git a/.github/workflows/test_dlt_connector.yml b/.github/workflows/test_dlt_connector.yml index 1096f415d..d831913fc 100644 --- a/.github/workflows/test_dlt_connector.yml +++ b/.github/workflows/test_dlt_connector.yml @@ -61,8 +61,8 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: DLT-Connector | docker-compose mariadb - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb + - name: DLT-Connector | docker compose mariadb + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb - name: Sleep for 30 seconds run: sleep 30s diff --git a/.github/workflows/test_e2e.yml b/.github/workflows/test_e2e.yml index 617097a53..590758248 100644 --- a/.github/workflows/test_e2e.yml +++ b/.github/workflows/test_e2e.yml @@ -11,17 +11,17 @@ jobs: uses: actions/checkout@v3 - name: Boot up test system | docker-compose mariadb - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb - name: Boot up test system | docker-compose database - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database - name: Boot up test system | docker-compose backend run: | cd backend cp .env.test_e2e .env cd .. - docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend + docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend - name: Sleep for 10 seconds run: sleep 10s @@ -35,10 +35,10 @@ jobs: yarn && yarn seed - name: Boot up test system | docker-compose frontends - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx - name: Boot up test system | docker-compose mailserver - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mailserver + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mailserver - name: End-to-end tests | prepare run: | diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index 92ccd95d2..66ea5736e 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -70,15 +70,15 @@ jobs: - name: Load Docker Image run: docker load < /tmp/federation.tar - - name: docker-compose mariadb - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb + - name: docker compose mariadb + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb - name: Sleep for 30 seconds run: sleep 30s shell: bash - - name: docker-compose database - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database + - name: docker compose database + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database - name: Sleep for 30 seconds run: sleep 30s From bf50f04f4c4e47ffd2f4d1706671dcefae8a4745 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 8 Aug 2024 13:07:22 +0200 Subject: [PATCH 2/2] update docker-compose test file --- docker-compose.test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index ff6ed61b8..a0562adf8 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -95,6 +95,9 @@ services: ######################################################### mariadb: image: gradido/mariadb:test + environment: + - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 + - MARIADB_USER=root networks: - internal-net - external-net