From fc6a37f17a8170a2714f086c267ddfd9783151cd Mon Sep 17 00:00:00 2001 From: karpovichart Date: Wed, 7 Aug 2024 22:10:20 +0300 Subject: [PATCH 1/4] change docker image name for int test --- int-test-infra/docker-compose.int-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/int-test-infra/docker-compose.int-test.yml b/int-test-infra/docker-compose.int-test.yml index 0248ba2..af0dd90 100644 --- a/int-test-infra/docker-compose.int-test.yml +++ b/int-test-infra/docker-compose.int-test.yml @@ -1,7 +1,7 @@ version: '3' services: csr: - image: csr:int-test + image: docker.io/library/csr:int-test container_name: csr ports: - "8089:8089" @@ -35,4 +35,4 @@ services: retries: 5 networks: - go-network: \ No newline at end of file + go-network: From 9921a8ac3da0d11888133f11c7f2046b416d0c90 Mon Sep 17 00:00:00 2001 From: karpovichart Date: Wed, 7 Aug 2024 22:25:56 +0300 Subject: [PATCH 2/4] Update docker-compose.int-test.yml --- int-test-infra/docker-compose.int-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/int-test-infra/docker-compose.int-test.yml b/int-test-infra/docker-compose.int-test.yml index af0dd90..4514faf 100644 --- a/int-test-infra/docker-compose.int-test.yml +++ b/int-test-infra/docker-compose.int-test.yml @@ -1,7 +1,8 @@ version: '3' services: csr: - image: docker.io/library/csr:int-test + image: csr:int-test + entrypoint: ls -lat container_name: csr ports: - "8089:8089" From dbd1a31254711d8c09a7607024d7bf4247fe3483 Mon Sep 17 00:00:00 2001 From: karpovichart Date: Wed, 7 Aug 2024 22:43:29 +0300 Subject: [PATCH 3/4] Update integration_test.yml --- .github/workflows/integration_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 5e20f0b..e0784f0 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -30,9 +30,9 @@ jobs: run: | make build-int-image - name: Run service - uses: isbang/compose-action@v1.4.1 + uses: hoverkraft-tech/compose-action@v2.0.1 with: compose-file: "./int-test-infra/docker-compose.int-test.yml" - name: Test run: | - make int-test-without-infra \ No newline at end of file + make int-test-without-infra From 0741b5f7f722584e24707d894b38d6f77e00d812 Mon Sep 17 00:00:00 2001 From: karpovichart Date: Wed, 7 Aug 2024 22:56:56 +0300 Subject: [PATCH 4/4] Update docker-compose.int-test.yml --- int-test-infra/docker-compose.int-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/int-test-infra/docker-compose.int-test.yml b/int-test-infra/docker-compose.int-test.yml index 4514faf..ddd46f4 100644 --- a/int-test-infra/docker-compose.int-test.yml +++ b/int-test-infra/docker-compose.int-test.yml @@ -2,7 +2,6 @@ version: '3' services: csr: image: csr:int-test - entrypoint: ls -lat container_name: csr ports: - "8089:8089"