Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump cc to 2.5.139 #1

Merged
merged 1 commit into from
Sep 12, 2024
Merged

chore: bump cc to 2.5.139 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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 }}
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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

Expand Down
Loading