From 5721d86c2b344d23add161ae0efc72791d4e1cdc Mon Sep 17 00:00:00 2001
From: Martin Hrabovcin <martin.hrabovcin@nutanix.com>
Date: Thu, 12 Sep 2024 10:12:30 +0000
Subject: [PATCH] chore: bump cc to 2.5.139

---
 .github/workflows/ci.yml | 6 +++---
 Dockerfile               | 7 +++++--
 Makefile                 | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e404b17..fe62bdb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,12 +3,12 @@ name: CI
 on:
   push:
     branches:
-      - 'master'
+      - "master"
     tags:
       - "[0-9].[0-9]+.[0-9]+*"
   pull_request:
     branches:
-      - 'master'
+      - "master"
 
 env:
   CONTAINER_LABELS: |
@@ -52,7 +52,7 @@ jobs:
           flavor: |
             latest=false
           images: |
-            ghcr.io/banzaicloud/cruise-control
+            ghcr.io/mesosphere/cruise-control
           tags: |
             type=sha,enable=true,format=short,prefix=
           labels: ${{ env.CONTAINER_LABELS }}
diff --git a/Dockerfile b/Dockerfile
index 5204a50..87dbd16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.7_7-jdk as cruisecontrol
+FROM eclipse-temurin:17.0.9_9-jdk as cruisecontrol
 ARG CRUISE_CONTROL_VERSION
 WORKDIR /
 USER root
@@ -34,9 +34,12 @@ RUN \
   && npm install \
   && npm run build
 
-FROM eclipse-temurin:17.0.7_7-jre
+FROM eclipse-temurin:17.0.9_9-jre
 ENV CRUISE_CONTROL_LIBS="/var/lib/cruise-control-ext-libs/*"
 ENV CLASSPATH="${CRUISE_CONTROL_LIBS}"
+RUN \
+  set -xe; \
+  apt update && apt upgrade -y && apt clean
 RUN \
   set -xe; \
   mkdir -p /opt/cruise-control \
diff --git a/Makefile b/Makefile
index a6358f7..2c7d21a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SHELL = /usr/bin/env bash -o pipefail
 
 CI ?= false
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
-CRUISE_CONTROL_VERSION ?= 2.5.123
+CRUISE_CONTROL_VERSION ?= 2.5.139
 CRUISE_CONTROL_UI_GIT_REF ?= b1208a6f020c21ff967297814c2e893eed3f3183
 DOCKER_COMPOSE_PROJECT_NAME := "docker-cruise-control"
 DOCKER_COMPOSE_PROJECT_DIR := "./deploy"
@@ -12,7 +12,7 @@ GIT_SHA := $(shell git rev-parse  HEAD)
 GIT_SHA_SHORT := $(shell git rev-parse --short HEAD)
 GIT_REF := $(shell git describe --dirty --always)
 
-export CRUISE_CONTROL_IMAGE ?= "ghcr.io/banzaicloud/cruise-control:$(GIT_SHA_SHORT)"
+export CRUISE_CONTROL_IMAGE ?= "ghcr.io/mesosphere/cruise-control:$(GIT_SHA_SHORT)"
 
 ##@ General