diff --git a/.github/workflows/push-mimir-build-image.yml b/.github/workflows/push-mimir-build-image.yml index 10c1810f814..ddc890628ef 100644 --- a/.github/workflows/push-mimir-build-image.yml +++ b/.github/workflows/push-mimir-build-image.yml @@ -30,7 +30,8 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub - uses: docker/login-action@v3 + # Temporarily downgrade from v3, since it fails to authenticate + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/Makefile b/Makefile index 3423294a504..923f4021b5e 100644 --- a/Makefile +++ b/Makefile @@ -212,7 +212,7 @@ mimir-build-image/$(UPTODATE): mimir-build-image/* # All the boiler plate for building golang follows: SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E") BUILD_IN_CONTAINER ?= true -LATEST_BUILD_IMAGE_TAG ?= pr5960-facaa1c135 +LATEST_BUILD_IMAGE_TAG ?= pr6188-f9147daefa # TTY is parameterized to allow Google Cloud Builder to run builds, # as it currently disallows TTY devices. This value needs to be overridden diff --git a/mimir-build-image/Dockerfile b/mimir-build-image/Dockerfile index 877cea71782..af99e3cc480 100644 --- a/mimir-build-image/Dockerfile +++ b/mimir-build-image/Dockerfile @@ -4,7 +4,7 @@ # Provenance-includes-copyright: The Cortex Authors. FROM k8s.gcr.io/kustomize/kustomize:v4.5.5 as kustomize -FROM alpine/helm:3.11.1 as helm +FROM alpine/helm:3.13.0 as helm FROM golang:1.21.1-bullseye ARG goproxyValue ENV GOPROXY=${goproxyValue}