diff --git a/.github/actions/build-ci-image/action.yml b/.github/actions/build-ci-image/action.yml index 8377434b..6b3223f0 100644 --- a/.github/actions/build-ci-image/action.yml +++ b/.github/actions/build-ci-image/action.yml @@ -21,6 +21,10 @@ inputs: tags: default: null required: true + registry: + default: "docker.io" + required: true + type: string username: default: null required: true @@ -68,6 +72,7 @@ runs: - name: Login to Docker Hub uses: docker/login-action@v3 with: + registry: ${{ inputs.registry }} username: ${{ inputs.username }} password: ${{ inputs.password }} diff --git a/.github/actions/merge-ci-images/action.yml b/.github/actions/merge-ci-images/action.yml index 98218095..ed1a2948 100644 --- a/.github/actions/merge-ci-images/action.yml +++ b/.github/actions/merge-ci-images/action.yml @@ -10,6 +10,10 @@ inputs: tags: default: null required: true + registry: + default: "docker.io" + required: true + type: string username: default: null required: true @@ -46,6 +50,7 @@ runs: - name: Login to Docker Hub uses: docker/login-action@v3 with: + registry: ${{ inputs.registry }} username: ${{ inputs.username }} password: ${{ inputs.password }} diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index b0e14889..ea0bf352 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -17,7 +17,7 @@ on: workflow_dispatch: env: - REGISTRY_IMAGE_ROOT: libfn/ci-build + REGISTRY_IMAGE_ROOT: libfn.azurecr.io/ci-build jobs: build: @@ -59,8 +59,9 @@ jobs: tags: | type=raw,value=${{ env.RELEASE }} type=sha,prefix=${{ env.RELEASE }}-sha- - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: libfn.azurecr.io + username: ${{ secrets.AZURECR_NAME }} + password: ${{ secrets.AZURECR_PASS }} build_args: | GCC_RELEASE=${{ env.RELEASE }} CLANG_RELEASE=${{ env.RELEASE }} @@ -104,6 +105,7 @@ jobs: tags: | type=raw,value=${{ env.RELEASE }} type=sha,prefix=${{ env.RELEASE }}-sha- - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: libfn.azurecr.io + username: ${{ secrets.AZURECR_NAME }} + password: ${{ secrets.AZURECR_PASS }} title: "build-${{ env.COMPILER}}-${{ env.RELEASE }}" diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 00bd61a9..503f1d14 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -17,7 +17,7 @@ on: workflow_dispatch: env: - REGISTRY_IMAGE: libfn/ci-docs + REGISTRY_IMAGE: libfn.azurecr.io/ci-docs jobs: build: @@ -44,8 +44,9 @@ jobs: type=schedule,pattern={{date 'YYYYMMDD'}} type=raw,value=latest,enable={{is_default_branch}} type=sha - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: libfn.azurecr.io + username: ${{ secrets.AZURECR_NAME }} + password: ${{ secrets.AZURECR_PASS }} context: "ci/docs" title: "docs" push: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }} @@ -69,6 +70,7 @@ jobs: type=schedule,pattern={{date 'YYYYMMDD'}} type=raw,value=latest,enable={{is_default_branch}} type=sha - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: libfn.azurecr.io + username: ${{ secrets.AZURECR_NAME }} + password: ${{ secrets.AZURECR_PASS }} title: "docs" diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index 4919152f..34647771 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -17,7 +17,7 @@ on: workflow_dispatch: env: - REGISTRY_IMAGE: libfn/ci-pre-commit + REGISTRY_IMAGE: libfn.azurecr.io/ci-pre-commit jobs: build: @@ -44,8 +44,9 @@ jobs: type=schedule,pattern={{date 'YYYYMMDD'}} type=raw,value=latest,enable={{is_default_branch}} type=sha - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: libfn.azurecr.io + username: ${{ secrets.AZURECR_NAME }} + password: ${{ secrets.AZURECR_PASS }} context: "ci/pre-commit" title: "pre-commit" push: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }} @@ -69,6 +70,7 @@ jobs: type=schedule,pattern={{date 'YYYYMMDD'}} type=raw,value=latest,enable={{is_default_branch}} type=sha - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: libfn.azurecr.io + username: ${{ secrets.AZURECR_NAME }} + password: ${{ secrets.AZURECR_PASS }} title: "pre-commit"