Add OpenJ9 SCC layer to full images (#175)

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
OpenLiberty · Apr 29, 2020 · 71dc150 · 71dc150
1 parent 15a2770
commit 71dc150
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/releases/latest/full/Dockerfile.ubi.adoptopenjdk11 b/releases/latest/full/Dockerfile.ubi.adoptopenjdk11
@@ -1,3 +1,9 @@
 FROM openliberty/open-liberty:kernel-java11-openj9-ubi
 
 RUN cp /opt/ol/wlp/templates/servers/javaee8/server.xml /config/server.xml
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && chown -R 1001:0 /opt/ol/wlp/output \
+    && chmod -R g+rwx /opt/ol/wlp/output
diff --git a/releases/latest/full/Dockerfile.ubi.adoptopenjdk13 b/releases/latest/full/Dockerfile.ubi.adoptopenjdk13
@@ -1,3 +1,9 @@
 FROM openliberty/open-liberty:kernel-java13-openj9-ubi
 
 RUN cp /opt/ol/wlp/templates/servers/javaee8/server.xml /config/server.xml
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && chown -R 1001:0 /opt/ol/wlp/output \
+    && chmod -R g+rwx /opt/ol/wlp/output
diff --git a/releases/latest/full/Dockerfile.ubi.adoptopenjdk8 b/releases/latest/full/Dockerfile.ubi.adoptopenjdk8
@@ -1,3 +1,9 @@
 FROM openliberty/open-liberty:kernel-java8-openj9-ubi
 
 RUN cp /opt/ol/wlp/templates/servers/javaee8/server.xml /config/server.xml
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && chown -R 1001:0 /opt/ol/wlp/output \
+    && chmod -R g+rwx /opt/ol/wlp/output
diff --git a/releases/latest/full/Dockerfile.ubi.ibmjava8 b/releases/latest/full/Dockerfile.ubi.ibmjava8
@@ -1,3 +1,9 @@
 FROM openliberty/open-liberty:kernel-java8-ibmjava-ubi
 
 RUN cp /opt/ol/wlp/templates/servers/javaee8/server.xml /config/server.xml
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && chown -R 1001:0 /opt/ol/wlp/output \
+    && chmod -R g+rwx /opt/ol/wlp/output
diff --git a/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk8 b/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,3 +1,9 @@
 FROM open-liberty:kernel-java8-openj9
 
 RUN cp /opt/ol/wlp/templates/servers/javaee8/server.xml /config/server.xml
+
+# Create a new SCC layer
+RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && chown -R 1001:0 /opt/ol/wlp/output \
+    && chmod -R g+rwx /opt/ol/wlp/output