Skip to content

Commit bd60cb2

Browse files
PCP-3830: Update golang builder image and registry (#221) (#222)
1 parent 35c21dd commit bd60cb2

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

.github/workflows/spectro-release.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
# Ensure that the credentials are provided as encrypted secrets
2222
env:
2323
SPECTRO_VERSION: ${{ github.event.inputs.release_version }}
24-
LEGACY_REGISTRY: gcr.io/spectro-images-public/release/cluster-api
25-
FIPS_REGISTRY: gcr.io/spectro-images-public/release-fips/cluster-api
24+
LEGACY_REGISTRY: us-docker.pkg.dev/palette-images/palette/cluster-api
25+
FIPS_REGISTRY: us-docker.pkg.dev/palette-images-fips/palette/cluster-api
2626
steps:
2727
-
2828
uses: mukunku/[email protected]
@@ -37,8 +37,8 @@ jobs:
3737
-
3838
if: ${{ github.event.inputs.rel_type == 'rc' }}
3939
run: |
40-
echo "LEGACY_REGISTRY=gcr.io/spectro-dev-public/release/cluster-api" >> $GITHUB_ENV
41-
echo "FIPS_REGISTRY=gcr.io/spectro-dev-public/release-fips/cluster-api" >> $GITHUB_ENV
40+
echo "LEGACY_REGISTRY=us-east1-docker.pkg.dev/spectro-images/dev/cluster-api" >> $GITHUB_ENV
41+
echo "FIPS_REGISTRY=us-east1-docker.pkg.dev/spectro-images/dev-fips/cluster-api" >> $GITHUB_ENV
4242
-
4343
uses: actions/checkout@v3
4444
-
@@ -51,6 +51,13 @@ jobs:
5151
registry: ${{ secrets.REGISTRY_URL }}
5252
username: ${{ secrets.REGISTRY_USERNAME }}
5353
password: ${{ secrets.REGISTRY_PASSWORD }}
54+
-
55+
name: Login to dev private registry
56+
uses: docker/login-action@v1
57+
with:
58+
registry: ${{ secrets.DEV_REGISTRY_URL }}
59+
username: ${{ secrets.REGISTRY_USERNAME }}
60+
password: ${{ secrets.REGISTRY_PASSWORD }}
5461
-
5562
name: Build Image
5663
env:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
ARG BUILDER_GOLANG_VERSION
2121
# First stage: build the executable.
22-
FROM --platform=$TARGETPLATFORM gcr.io/spectro-images-public/golang:${BUILDER_GOLANG_VERSION}-alpine as toolchain
22+
FROM --platform=$TARGETPLATFORM us-docker.pkg.dev/palette-images/build-base-images/golang:${BUILDER_GOLANG_VERSION}-alpine as toolchain
2323
ARG goproxy=https://proxy.golang.org
2424
ENV GOPROXY=$goproxy
2525

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN))
178178
# It is set by Prow GIT_TAG, a git-based tag of the form vYYYYMMDD-hash, e.g., v20210120-v0.3.10-308-gc61521971
179179
# Fips Flags
180180
FIPS_ENABLE ?= ""
181-
BUILDER_GOLANG_VERSION ?= 1.22
181+
BUILDER_GOLANG_VERSION ?= 1.23
182182
BUILD_ARGS = --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg BUILDER_GOLANG_VERSION=${BUILDER_GOLANG_VERSION}
183183

184184
RELEASE_LOC := release

0 commit comments

Comments
 (0)