sidecar is built on Debian Buster

instaclustr · Jan 25, 2021 · 064c87f · 064c87f
1 parent 1b91817
commit 064c87f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 \
     "$@"