diff --git a/.github/workflows/release_module_release-channels.yml b/.github/workflows/release_module_release-channels.yml index dd131e57f0..fa92f90c54 100644 --- a/.github/workflows/release_module_release-channels.yml +++ b/.github/workflows/release_module_release-channels.yml @@ -441,12 +441,11 @@ jobs: with: go-version: "${{ env.GO_VERSION }}" - - name: Login to PROD_REGISTRY - uses: deckhouse/modules-actions/setup@v2 + - name: Log in to private registry + id: registry-login + uses: ./.github/actions/registry-login with: - registry: ${{ vars.PROD_READ_REGISTRY }} - registry_login: ${{ secrets.PROD_READ_REGISTRY_USER }} - registry_password: ${{ secrets.PROD_READ_REGISTRY_PASSWORD }} + docker_cfg: ${{ secrets.PROD_RU_REGISTRY_DOCKER_CFG }} - uses: actions/checkout@v4 with: diff --git a/tools/moduleversions/Taskfile.dist.yaml b/tools/moduleversions/Taskfile.dist.yaml index 53b524cacd..fb6620c5a1 100644 --- a/tools/moduleversions/Taskfile.dist.yaml +++ b/tools/moduleversions/Taskfile.dist.yaml @@ -1,7 +1,7 @@ version: "3" vars: - PROD_REGISTRY: registry.deckhouse.io/deckhouse + PROD_REGISTRY: registry.deckhouse.ru/deckhouse CHANNEL: '{{ .CHANNEL | default "alpha" }}' VERSION: "{{ .VERSION }}" @@ -45,7 +45,7 @@ tasks: cmds: - | if [[ -z "{{ .VERSION }}" ]] || [[ -z "{{ .CHANNEL }}" ]]; then - echo "TAG and CHANNEL are required" + echo "VERSION (tag) and CHANNEL are required" exit 1 fi @@ -56,7 +56,7 @@ tasks: check_editions_version() { local editions=("ee" "fe" "ce" "se-plus") - local prod_registry="registry.deckhouse.io/deckhouse" + local prod_registry={{ .PROD_REGISTRY }} local channel=$1 local version=$2