diff --git a/.github/workflows/spectro-release.yaml b/.github/workflows/spectro-release.yaml index c7de22f43d2d..54372e5a0eae 100644 --- a/.github/workflows/spectro-release.yaml +++ b/.github/workflows/spectro-release.yaml @@ -21,8 +21,8 @@ jobs: # Ensure that the credentials are provided as encrypted secrets env: SPECTRO_VERSION: ${{ github.event.inputs.release_version }} - LEGACY_REGISTRY: gcr.io/spectro-images-public/release/cluster-api - FIPS_REGISTRY: gcr.io/spectro-images-public/release-fips/cluster-api + LEGACY_REGISTRY: us-docker.pkg.dev/palette-images/palette/cluster-api + FIPS_REGISTRY: us-docker.pkg.dev/palette-images-fips/palette/cluster-api steps: - uses: mukunku/tag-exists-action@v1.2.0 @@ -37,8 +37,8 @@ jobs: - if: ${{ github.event.inputs.rel_type == 'rc' }} run: | - echo "LEGACY_REGISTRY=gcr.io/spectro-dev-public/release/cluster-api" >> $GITHUB_ENV - echo "FIPS_REGISTRY=gcr.io/spectro-dev-public/release-fips/cluster-api" >> $GITHUB_ENV + echo "LEGACY_REGISTRY=us-east1-docker.pkg.dev/spectro-images/dev/cluster-api" >> $GITHUB_ENV + echo "FIPS_REGISTRY=us-east1-docker.pkg.dev/spectro-images/dev-fips/cluster-api" >> $GITHUB_ENV - uses: actions/checkout@v3 - @@ -51,6 +51,13 @@ jobs: registry: ${{ secrets.REGISTRY_URL }} username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_PASSWORD }} + - + name: Login to dev private registry + uses: docker/login-action@v1 + with: + registry: ${{ secrets.DEV_REGISTRY_URL }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_PASSWORD }} - name: Build Image env: diff --git a/Dockerfile b/Dockerfile index ab992cc87602..4b7e86a79a90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ ARG BUILDER_GOLANG_VERSION # First stage: build the executable. -FROM --platform=$TARGETPLATFORM gcr.io/spectro-images-public/golang:${BUILDER_GOLANG_VERSION}-alpine as toolchain +FROM --platform=$TARGETPLATFORM us-docker.pkg.dev/palette-images/build-base-images/golang:${BUILDER_GOLANG_VERSION}-alpine as toolchain ARG goproxy=https://proxy.golang.org ENV GOPROXY=$goproxy diff --git a/Makefile b/Makefile index 5773d4bfc5a6..10c4a362f63e 100644 --- a/Makefile +++ b/Makefile @@ -178,7 +178,7 @@ GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)) # It is set by Prow GIT_TAG, a git-based tag of the form vYYYYMMDD-hash, e.g., v20210120-v0.3.10-308-gc61521971 # Fips Flags FIPS_ENABLE ?= "" -BUILDER_GOLANG_VERSION ?= 1.22 +BUILDER_GOLANG_VERSION ?= 1.23 BUILD_ARGS = --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg BUILDER_GOLANG_VERSION=${BUILDER_GOLANG_VERSION} RELEASE_LOC := release