diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/iroha2-dev.yml index f6beae46fcf..0ab1a465cbb 100644 --- a/.github/workflows/iroha2-dev.yml +++ b/.github/workflows/iroha2-dev.yml @@ -6,7 +6,7 @@ on: env: CARGO_TERM_COLOR: always - #IMAGE_TAG: dev-test + IMAGE_TAG: hyperledger/iroha2:dev jobs: registry: @@ -15,40 +15,39 @@ jobs: image: hyperledger/iroha2-ci:nightly-2024-01-12 steps: - uses: actions/checkout@v4 - - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to Soramitsu Harbor - uses: docker/login-action@v3 - with: - registry: docker.soramitsu.co.jp - username: ${{ secrets.HARBOR_USERNAME }} - password: ${{ secrets.HARBOR_TOKEN }} + # - uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} + # - name: Login to Soramitsu Harbor + # uses: docker/login-action@v3 + # with: + # registry: docker.soramitsu.co.jp + # username: ${{ secrets.HARBOR_USERNAME }} + # password: ${{ secrets.HARBOR_TOKEN }} - name: Set up Docker Buildx id: buildx if: always() uses: docker/setup-buildx-action@v3 with: install: true - # - name: Build and export to Docker - # uses: docker/build-push-action@v5 - # if: always() - # with: - # context: . - # load: true - # file: Dockerfile - # tags: ${{ env.IMAGE_TAG }} + - name: Build and export to Docker + uses: docker/build-push-action@v5 + if: always() + with: + context: . + load: true + file: Dockerfile + tags: ${{ env.IMAGE_TAG }} - name: Test image before pushing uses: adambirds/docker-compose-action@v1.3.0 - if: always() with: compose-file: "./docker-compose-test.yml" up-flags: "-d" down-flags: "--volumes" test-command: if [ `curl -X GET http://127.0.0.1:8080/health` != ""\"Healthy"\"" ]; then exit 1; fi env: - IMAGE_TAG: "dev-test" + IMAGE_TAG: ${{ env.IMAGE_TAG }} # - name: Build and push iroha2:dev image # uses: docker/build-push-action@v5 # with: diff --git a/docker-compose-test.yml b/docker-compose-test.yml index 780ead1d55f..5877c6e5bbd 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -4,10 +4,10 @@ version: '3.8' services: iroha0: - image: hyperledger/iroha2:${IMAGE_TAG} + image: ${IMAGE_TAG} platform: linux/amd64 environment: - IMAGE_TAG: dev + IMAGE_TAG: hyperledger/iroha2:dev IROHA_CHAIN_ID: 00000000-0000-0000-0000-000000000000 IROHA_CONFIG: /config/config.json IROHA_PUBLIC_KEY: ed01208BA62848CF767D72E7F7F4B9D2D7BA07FEE33760F79ABE5597A51520E292A0CB @@ -29,7 +29,7 @@ services: image: hyperledger/iroha2:${IMAGE_TAG} platform: linux/amd64 environment: - IMAGE_TAG: dev + IMAGE_TAG: hyperledger/iroha2:dev IROHA_CHAIN_ID: 00000000-0000-0000-0000-000000000000 IROHA_CONFIG: /config/config.json IROHA_PUBLIC_KEY: ed0120815BBDC9775D28C3633269B25F22D048E2AA2E36017CBE5AD85F15220BEB6F6F @@ -48,7 +48,7 @@ services: image: hyperledger/iroha2:${IMAGE_TAG} platform: linux/amd64 environment: - IMAGE_TAG: dev + IMAGE_TAG: hyperledger/iroha2:dev IROHA_CHAIN_ID: 00000000-0000-0000-0000-000000000000 IROHA_CONFIG: /config/config.json IROHA_PUBLIC_KEY: ed0120F417E0371E6ADB32FD66749477402B1AB67F84A8E9B082E997980CC91F327736 @@ -67,7 +67,7 @@ services: image: hyperledger/iroha2:${IMAGE_TAG} platform: linux/amd64 environment: - IMAGE_TAG: dev + IMAGE_TAG: hyperledger/iroha2:dev IROHA_CHAIN_ID: 00000000-0000-0000-0000-000000000000 IROHA_CONFIG: /config/config.json IROHA_PUBLIC_KEY: ed0120A66522370D60B9C09E79ADE2E9BB1EF2E78733A944B999B3A6AEE687CE476D61