diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index cf31e5ae..b6f57699 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - move-tests-to-askar + - concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -28,6 +28,7 @@ jobs: - service: aries-endorser-agent GIT_REPO_URL: hyperledger/aries-endorser-service GIT REPO: "" + GIT_BRANCH: move-tests-to-askar DOCKER_FILE_PATH: Dockerfile.acapy # The docker path, file, is the relative path to the docker file from the root of the repo. SOURCE_CONTEXT_DIR: docker/acapy # The context dir, context, sets the context for the build. i.e. where the build will source files from SOURCE_IMAGE_REGISTRY: "" @@ -38,11 +39,13 @@ jobs: - service: aries-endorser-db GIT_REPO_URL: hyperledger/aries-endorser-service GIT REPO: "" + GIT_BRANCH: move-tests-to-askar PATH: docker/wallet/config BUILDER_IMAGE: 'quay.io/fedora/postgresql-13:13' - service: aries-endorser-backup GIT_REPO_URL: BCDevOps/backup-container GIT REPO: "" + GIT_BRANCH: master DOCKER_FILE_PATH: Dockerfile # The docker path, file, is the relative path to the docker file from the root of the repo. SOURCE_CONTEXT_DIR: docker # The context dir, context, sets the context for the build. i.e. where the build will source files from SOURCE_IMAGE_REGISTRY: "" @@ -52,6 +55,7 @@ jobs: REGISTRY_PASSWORD_SECRET_NAME: ARTIFACTORY_PASSWORD - service: aries-endorser-proxy GIT REPO: "" + GIT_BRANCH: workflow DOCKER_FILE_PATH: Dockerfile # The docker path, file, is the relative path to the docker file from the root of the repo. SOURCE_CONTEXT_DIR: proxy # The context dir, context, sets the context for the build. i.e. where the build will source files from SOURCE_IMAGE_REGISTRY: "artifacts.developer.gov.bc.ca/docker-remote/" @@ -62,6 +66,7 @@ jobs: - service: aries-endorser-api GIT_REPO_URL: hyperledger/aries-endorser-service GIT REPO: "" + GIT_BRANCH: move-tests-to-askar DOCKER_FILE_PATH: Dockerfile.endorser # The docker path, file, is the relative path to the docker file from the root of the repo. SOURCE_CONTEXT_DIR: endorser # The context dir, context, sets the context for the build. i.e. where the build will source files from SOURCE_IMAGE_REGISTRY: artifacts.developer.gov.bc.ca/docker-remote/ @@ -163,27 +168,27 @@ jobs: if: contains(fromJSON('["aries-endorser-db"]'), matrix.service) run: echo "tags=$(echo '${{ steps.meta.outputs.tags }}' | grep -oE ':([^[:space:]]+)' | sed '/workflow/d' | sed 's/://g' | tr '\n' ' ')" >> $GITHUB_OUTPUT - - name: Build database image - id: build_image - if: contains(fromJSON('["aries-endorser-db"]'), matrix.service) - uses: redhat-actions/s2i-build@v2 - with: - path_context: ${{ matrix.PATH }} - # Builder image for a java project - builder_image: ${{ matrix.BUILDER_IMAGE }} - image: dts-endorser-service/${{ matrix.service }} - tags: ${{ steps.extract.outputs.tags }} + # - name: Build database image + # id: build_image + # if: contains(fromJSON('["aries-endorser-db"]'), matrix.service) + # uses: redhat-actions/s2i-build@v2 + # with: + # path_context: ${{ matrix.PATH }} + # # Builder image for a java project + # builder_image: ${{ matrix.BUILDER_IMAGE }} + # image: dts-endorser-service/${{ matrix.service }} + # tags: ${{ steps.extract.outputs.tags }} - - name: Push database image - id: push - if: contains(fromJSON('["aries-endorser-db"]'), matrix.service) - uses: redhat-actions/push-to-registry@v2 - with: - tags: ${{ steps.build_image.outputs.tags }} - image: ${{ steps.build_image.outputs.image }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: ghcr.io/bcgov + # - name: Push database image + # id: push + # if: contains(fromJSON('["aries-endorser-db"]'), matrix.service) + # uses: redhat-actions/push-to-registry@v2 + # with: + # tags: ${{ steps.build_image.outputs.tags }} + # image: ${{ steps.build_image.outputs.image }} + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} + # registry: ghcr.io/bcgov - name: Display ${{ matrix.service }} image results id: digests