From 064c87fbd2135139c087c0a88f338c92bec82061 Mon Sep 17 00:00:00 2001
From: Stefan Miklosovic <stefan.miklosovic@instaclustr.com>
Date: Mon, 25 Jan 2021 17:59:36 +0100
Subject: [PATCH] sidecar is built on Debian Buster

---
 docker/Makefile                    | 4 +++-
 docker/cassandra-sidecar/Makefile  | 3 +--
 docker/cassandra-sidecar/icarus.sh | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/Makefile b/docker/Makefile
index 6d4706f0..9ffa3d77 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -31,6 +31,8 @@ cassandra-4:
 
 cassandra-4: base-openjre-11
 
-cassandra-3 cassandra-sidecar: base-openjre
+cassandra-3: base-openjre
+
+cassandra-sidecar: base-openjre-11
 
 .DEFAULT_GOAL := all
diff --git a/docker/cassandra-sidecar/Makefile b/docker/cassandra-sidecar/Makefile
index 86709465..9a836708 100644
--- a/docker/cassandra-sidecar/Makefile
+++ b/docker/cassandra-sidecar/Makefile
@@ -1,7 +1,6 @@
-include ../base-openjre/Makefile
-
 INSTACLUSTR_ICARUS_VERSION := 1.0.6
 INSTACLUSTR_ICARUS_JAR := icarus-$(INSTACLUSTR_ICARUS_VERSION).jar
+OPENJRE_IMAGE := $(if $(OPENJRE_IMAGE),$(OPENJRE_IMAGE),"base-openjre:buster-11.0.9.1-1-1-deb10u2")
 
 ifeq ($(INSTACLUSTR_ICARUS_VERSION:%-SNAPSHOT=SNAPSHOT),SNAPSHOT)
 $(info SNAPSHOT version specified. Marking sidecar JAR target as .PHONY)
diff --git a/docker/cassandra-sidecar/icarus.sh b/docker/cassandra-sidecar/icarus.sh
index 9f1a3026..08dd2f2c 100755
--- a/docker/cassandra-sidecar/icarus.sh
+++ b/docker/cassandra-sidecar/icarus.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 exec -a "icarus" java \
-    -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XshowSettings:vm  \
+    -XX:+UnlockExperimentalVMOptions -XX:MaxRAMFraction=1 -XshowSettings:vm  \
     -jar /opt/lib/icarus/icarus.jar icarus \
     "$@"
\ No newline at end of file