Unverified Commit 55acdf9b authored by Nuwan Goonasekera's avatar Nuwan Goonasekera Committed by GitHub
Browse files

Merge pull request #12922 from nuwang/fix_docker_repo_names 

[21.05] Update docker autobuilds to use correct repos
parents fffde084 3d7b713f

.github/workflows/build_container_image.yaml

+18 −3
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ jobs: 
      - name: Set branch name

        id: branch

        run: echo "::set-output name=name::$(BRANCH_NAME=${GITHUB_REF##*/}; echo ${BRANCH_NAME/release_/})"

      - run: docker build . --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg IMAGE_TAG=${{ steps.branch.outputs.name }} --build-arg IMAGE_TAG=${{ steps.branch.outputs.name }} -t galaxy/galaxy-min:${{ steps.branch.outputs.name }} -f .k8s_ci.Dockerfile

      - run: docker tag galaxy/galaxy-min:${{ steps.branch.outputs.name }} quay.io/galaxy-min/galaxy:${{ steps.branch.outputs.name }}

      - name: Build container image

        run: docker build . --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg IMAGE_TAG=${{ steps.branch.outputs.name }} -t galaxyproject/galaxy-min:${{ steps.branch.outputs.name }} -t quay.io/galaxyproject/galaxy-min:${{ steps.branch.outputs.name }} -f .k8s_ci.Dockerfile

      - name: Create auto-expiring one for per-commit auto repository

        run: echo "FROM galaxyproject/galaxy-min:${{ steps.branch.outputs.name }}" | docker build --label "quay.expires-after"="90d" -t "quay.io/galaxyproject/galaxy-k8s-auto:${{ steps.commit.outputs.sha_short }}" -

      - name: Login to quay.io

        uses: actions-hub/docker/login@master

        env:
@@ -32,4 +34,17 @@ jobs: 
      - name: Push to quay.io with branch name

        uses: actions-hub/docker@master

        with:

          args: push quay.io/galaxy-min/galaxy:${{ steps.branch.outputs.name }}
 
          args: push quay.io/galaxyproject/galaxy-min:${{ steps.branch.outputs.name }}

      - name: Push to quay.io with commit hash

        uses: actions-hub/docker@master

        with:

          args: push quay.io/galaxyproject/galaxy-k8s-auto:${{ steps.commit.outputs.sha_short }}

      - name: Login to DockerHub

        uses: actions-hub/docker/login@master

        env:

          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

      - name: Push to DockerHub with branch name

        uses: actions-hub/docker@master

        with:

          args: push galaxyproject/galaxy-min:${{ steps.branch.outputs.name }}