From a19b8675ff614887ebf0d0611122b5a733f5fa14 Mon Sep 17 00:00:00 2001
From: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:13:05 -0700
Subject: [PATCH] Update build-image to
 https://github.com/cortexproject/cortex/commit/6dd64fcce93e87497f0e3f6594e74f030b4538b4
 (#6028)

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
---
 .github/workflows/test-build-deploy.yml | 12 ++++++------
 Makefile                                |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
index 3c0b8bbbca..39faea6d6e 100644
--- a/.github/workflows/test-build-deploy.yml
+++ b/.github/workflows/test-build-deploy.yml
@@ -17,7 +17,7 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
+      image: quay.io/cortexproject/build-image:master-6dd64fcce
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -46,7 +46,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
+      image: quay.io/cortexproject/build-image:master-6dd64fcce
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -89,7 +89,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
+      image: quay.io/cortexproject/build-image:master-6dd64fcce
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -223,14 +223,14 @@ jobs:
         run: |
           touch build-image/.uptodate
           MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
-          make BUILD_IMAGE=quay.io/cortexproject/build-image:node_version_upgrade-60582e680 TTY='' configs-integration-test
+          make BUILD_IMAGE=quay.io/cortexproject/build-image:master-6dd64fcce TTY='' configs-integration-test
 
   deploy_website:
     needs: [build, test]
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
+      image: quay.io/cortexproject/build-image:master-6dd64fcce
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -272,7 +272,7 @@ jobs:
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
+      image: quay.io/cortexproject/build-image:master-6dd64fcce
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index b1af41119a..590dfe7fa4 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ build-image/$(UPTODATE): build-image/*
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER := true
 BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
-LATEST_BUILD_IMAGE_TAG ?= node_version_upgrade-60582e680
+LATEST_BUILD_IMAGE_TAG ?= master-6dd64fcce
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden