Skip to content

Commit 47884f2

Browse files
authored
Merge pull request #1007 from oracle/v2.1-openjdk11
Use openjdk:11-oracle with 2.1
2 parents 3452d28 + f9d3057 commit 47884f2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Pull base image
1010
# From the Docker store
1111
# -------------------------
12-
FROM openjdk:12-oracle
12+
FROM openjdk:11-oracle
1313
RUN yum -y install openssl && yum clean all
1414

1515
# Maintainer

src/scripts/operator.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ cp /operator/logstash.conf /logs/logstash.conf
6565
# the logstash container/pod.
6666

6767
# Container memory optimizaton flags
68-
HEAP="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XshowSettings:vm"
68+
HEAP="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMFraction=1 -XshowSettings:vm"
6969

7070
# Start operator
7171
java $HEAP $MOCKING_WLS $DEBUG $LOGGING -jar /operator/weblogic-kubernetes-operator.jar &

0 commit comments

Comments
 (0)