From e487d87d1dccdd1a5af5de3a8243762c0045daa3 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Thu, 6 Jul 2023 11:35:26 +0100 Subject: [PATCH 01/15] fix: the image repo and version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c4aa4c41..7e65df40 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: # interval: 10s # start_period: 30s atalaprism-mediator: - image: ghcr.io/input-output-hk/mediator:0.1.1-SNAPSHOT + image: ghcr.io/input-output-hk/atala-prism-mediator:0.2.0-SNAPSHOT ports: - 8080:8080 network_mode: host #hash on mac remove this the default is bridge we can use host.docker.internal From c65d3fdf624b7ebd71a895a3058eb7c92054ac19 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Thu, 6 Jul 2023 12:16:41 +0100 Subject: [PATCH 02/15] fix docker compose --- .github/workflows/integration-tests.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 13a7e91d..afebb143 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -49,7 +49,7 @@ jobs: - name: Install Compose uses: ndeloof/install-compose-action@v0.0.1 with: - version: v2.12.2 # defaults to 'latest' + version: v2.19.1 # defaults to 'latest' legacy: true # will also install in PATH as `docker-compose` - name: Build local version of Mediator Agent @@ -61,8 +61,8 @@ jobs: cd "${MEDIATOR_PATH}" || exit 129 NODE_OPTIONS=--openssl-legacy-provider sbt -mem 2048 -J-Xmx5120m docker:publishLocal MEDIATOR_VERSION=$(cut version.sbt -d '=' -f2 | tr -d '" ') + echo "MEDIATOR_VERSION=${MEDIATOR_VERSION}" >> $GITHUB_ENV echo ${MEDIATOR_VERSION} - - name: Start Mediator uses: isbang/compose-action@v1.4.1 with: @@ -70,7 +70,12 @@ jobs: compose-flags: "" up-flags: "--wait" down-flags: "--volumes" - + env : + GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} + GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} + ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} + ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} + MEDIATOR_VERSION: ${{ MEDIATOR_VERSION }} - name: Run e2e tests env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} From b27cb19ebf75236b63bfd9037acd8555c709bd2b Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 10:12:04 +0100 Subject: [PATCH 03/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index afebb143..0662691b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -70,7 +70,7 @@ jobs: compose-flags: "" up-flags: "--wait" down-flags: "--volumes" - env : + env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} From 3a00d6d2f8a24ac50091382512232330a4ebfad8 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 10:14:17 +0100 Subject: [PATCH 04/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 0662691b..7cd0c319 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -76,6 +76,7 @@ jobs: ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} MEDIATOR_VERSION: ${{ MEDIATOR_VERSION }} + - name: Run e2e tests env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} From 55eab142a0f561c6e7c5411383c64caa64d2ff01 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 10:15:04 +0100 Subject: [PATCH 05/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 7cd0c319..185bdfcd 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -70,13 +70,6 @@ jobs: compose-flags: "" up-flags: "--wait" down-flags: "--volumes" - env: - GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} - ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} - MEDIATOR_VERSION: ${{ MEDIATOR_VERSION }} - - name: Run e2e tests env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} From 2fd7310d199e891cd71a7cc2baf228bbbddf3014 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 10:16:16 +0100 Subject: [PATCH 06/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 185bdfcd..3b935233 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -65,6 +65,11 @@ jobs: echo ${MEDIATOR_VERSION} - name: Start Mediator uses: isbang/compose-action@v1.4.1 + env: + GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} + GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} + ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} + ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} with: compose-file: "./docker-compose.yml" compose-flags: "" From 41963a57277199a9d4560aef05872c7d7c0a3609 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 10:17:41 +0100 Subject: [PATCH 07/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 3b935233..716debc1 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -65,16 +65,13 @@ jobs: echo ${MEDIATOR_VERSION} - name: Start Mediator uses: isbang/compose-action@v1.4.1 - env: - GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} - ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} with: compose-file: "./docker-compose.yml" compose-flags: "" up-flags: "--wait" down-flags: "--volumes" + env: + GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - name: Run e2e tests env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} From 39beaab0d04a2c0a47b3aea085ba101ae74714ff Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 10:18:51 +0100 Subject: [PATCH 08/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 716debc1..079fc392 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -72,6 +72,7 @@ jobs: down-flags: "--volumes" env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} + GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} - name: Run e2e tests env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} From ec4503f785096abca5cc7ac48f2a89efa90587c7 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 10:20:21 +0100 Subject: [PATCH 09/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 079fc392..70c2a60f 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -73,6 +73,9 @@ jobs: env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} + MEDIATOR_VERSION: ${{ MEDIATOR_VERSION }} + ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} + ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} - name: Run e2e tests env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} From d08055a6b26e513c0b981eebd21466186d8b0777 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 10:31:36 +0100 Subject: [PATCH 10/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 70c2a60f..5143be4e 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -74,8 +74,6 @@ jobs: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} MEDIATOR_VERSION: ${{ MEDIATOR_VERSION }} - ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} - name: Run e2e tests env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} From a251fe29edd31656654b9761a58807e4670ee005 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 10:33:48 +0100 Subject: [PATCH 11/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5143be4e..13dc4615 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -73,7 +73,7 @@ jobs: env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} - MEDIATOR_VERSION: ${{ MEDIATOR_VERSION }} + - name: Run e2e tests env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} From d35f43e4383c057f295c11de39e64de5d98fc4a9 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 10:40:44 +0100 Subject: [PATCH 12/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 13dc4615..548bd93f 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -71,8 +71,9 @@ jobs: up-flags: "--wait" down-flags: "--volumes" env: - GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} + ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} + ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} + MEDIATOR_VERSION: ${{ secrets.ATALA_GITHUB_TOKEN }} - name: Run e2e tests env: From 2097020163a7fe23a1069d878856df280e14b500 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 11:08:36 +0100 Subject: [PATCH 13/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 548bd93f..9f512fc4 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -73,7 +73,7 @@ jobs: env: ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} - MEDIATOR_VERSION: ${{ secrets.ATALA_GITHUB_TOKEN }} + MEDIATOR_VERSION: ${{ MEDIATOR_VERSION }} - name: Run e2e tests env: diff --git a/docker-compose.yml b/docker-compose.yml index 7e65df40..360f16ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: # interval: 10s # start_period: 30s atalaprism-mediator: - image: ghcr.io/input-output-hk/atala-prism-mediator:0.2.0-SNAPSHOT + image: ghcr.io/input-output-hk/mediator:0.2.0-SNAPSHOT ports: - 8080:8080 network_mode: host #hash on mac remove this the default is bridge we can use host.docker.internal From beb1ff3dfc77ad4ecf3b66e72b4a6af4436110b6 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 11:10:30 +0100 Subject: [PATCH 14/15] [WIP]: update docker-compose version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 360f16ab..91f0ddd6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: # interval: 10s # start_period: 30s atalaprism-mediator: - image: ghcr.io/input-output-hk/mediator:0.2.0-SNAPSHOT + image: ghcr.io/input-output-hk/mediator:${MEDIATOR_VERSION:-0.2.0-SNAPSHOT} ports: - 8080:8080 network_mode: host #hash on mac remove this the default is bridge we can use host.docker.internal From 31a147b9ef49b3ab9a51c7ac1b6e94ce8642ecc8 Mon Sep 17 00:00:00 2001 From: Shailesh Patil Date: Fri, 7 Jul 2023 11:10:48 +0100 Subject: [PATCH 15/15] [WIP]: update docker-compose version --- .github/workflows/integration-tests.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 9f512fc4..185bdfcd 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -70,11 +70,6 @@ jobs: compose-flags: "" up-flags: "--wait" down-flags: "--volumes" - env: - ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} - MEDIATOR_VERSION: ${{ MEDIATOR_VERSION }} - - name: Run e2e tests env: GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }}