Clean logs after server warmup

Signed-off-by: Arthur De Magalhaes <ademagalhaes@gmail.com>
OpenLiberty · Oct 26, 2018 · 8c9bc40 · 8c9bc40
1 parent bf063a9
commit 8c9bc40
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+# Ignore .DS_Store 
+.DS_Store
+
diff --git a/library/javaee7/java8/ibmjava/Dockerfile b/library/javaee7/java8/ibmjava/Dockerfile
@@ -3,4 +3,4 @@ ENV KEYSTORE_REQUIRED "true"
 
 RUN cp /opt/ol/wlp/templates/servers/javaee7/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ && rm -rf /output/messaging
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ && rm -rf /output/messaging /logs/*
diff --git a/library/javaee7/java8/ibmsfj/Dockerfile b/library/javaee7/java8/ibmsfj/Dockerfile
@@ -3,4 +3,4 @@ ENV KEYSTORE_REQUIRED "true"
 
 RUN cp /opt/ol/wlp/templates/servers/javaee7/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ && rm -rf /output/messaging
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ && rm -rf /output/messaging /logs/*
diff --git a/library/javaee8/java8/ibmjava/Dockerfile b/library/javaee8/java8/ibmjava/Dockerfile
@@ -42,7 +42,7 @@ RUN /opt/ol/wlp/bin/server create \
     && mkdir /config/configDropins \
     && mkdir /config/configDropins/defaults \
     && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
-    && /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ && rm -rf /output/messaging
+    && /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ && rm -rf /output/messaging /logs/*
 
 EXPOSE 9080 9443
 

diff --git a/library/javaee8/java8/ibmsfj/Dockerfile b/library/javaee8/java8/ibmsfj/Dockerfile
@@ -34,7 +34,7 @@ RUN /opt/ol/wlp/bin/server create \
     && mkdir /config/configDropins \
     && mkdir /config/configDropins/defaults \
     && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
-    && /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ && rm -rf /output/messaging
+    && /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ && rm -rf /output/messaging /logs/*
 
 EXPOSE 9080 9443
 

diff --git a/library/microProfile1/java8/ibmjava/Dockerfile b/library/microProfile1/java8/ibmjava/Dockerfile
@@ -2,4 +2,4 @@ FROM open-liberty:kernel-java8-ibm
 
 RUN cp /opt/ol/wlp/templates/servers/microProfile1/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
diff --git a/library/microProfile1/java8/ibmsfj/Dockerfile b/library/microProfile1/java8/ibmsfj/Dockerfile
@@ -2,4 +2,4 @@ FROM open-liberty:kernel-java8-ibmsfj
 
 RUN cp /opt/ol/wlp/templates/servers/microProfile1/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
diff --git a/library/microProfile2/java8/ibmjava/Dockerfile b/library/microProfile2/java8/ibmjava/Dockerfile
@@ -2,4 +2,4 @@ FROM open-liberty:kernel-java8-ibm
 
 RUN cp /opt/ol/wlp/templates/servers/microProfile2/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
diff --git a/library/microProfile2/java8/ibmsfj/Dockerfile b/library/microProfile2/java8/ibmsfj/Dockerfile
@@ -2,4 +2,4 @@ FROM open-liberty:kernel-java8-ibmsfj
 
 RUN cp /opt/ol/wlp/templates/servers/microProfile2/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
diff --git a/library/springBoot1/java8/ibmjava/Dockerfile b/library/springBoot1/java8/ibmjava/Dockerfile
@@ -5,4 +5,4 @@ RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
 
 RUN cp /opt/ol/wlp/templates/servers/springBoot1/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
diff --git a/library/springBoot1/java8/ibmsfj/Dockerfile b/library/springBoot1/java8/ibmsfj/Dockerfile
@@ -5,4 +5,4 @@ RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
 
 RUN cp /opt/ol/wlp/templates/servers/springBoot1/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
diff --git a/library/springBoot2/java8/ibmjava/Dockerfile b/library/springBoot2/java8/ibmjava/Dockerfile
@@ -5,4 +5,4 @@ RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
 
 RUN cp /opt/ol/wlp/templates/servers/springBoot2/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
diff --git a/library/springBoot2/java8/ibmsfj/Dockerfile b/library/springBoot2/java8/ibmsfj/Dockerfile
@@ -5,4 +5,4 @@ RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
 
 RUN cp /opt/ol/wlp/templates/servers/springBoot2/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
diff --git a/library/webProfile7/java8/ibmjava/Dockerfile b/library/webProfile7/java8/ibmjava/Dockerfile
@@ -2,4 +2,4 @@ FROM open-liberty:kernel-java8-ibm
 
 RUN cp /opt/ol/wlp/templates/servers/webProfile7/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
diff --git a/library/webProfile7/java8/ibmsfj/Dockerfile b/library/webProfile7/java8/ibmsfj/Dockerfile
@@ -2,4 +2,4 @@ FROM open-liberty:kernel-java8-ibmsfj
 
 RUN cp /opt/ol/wlp/templates/servers/webProfile7/server.xml /config/server.xml
 
-RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
diff --git a/library/webProfile8/java8/ibmjava/Dockerfile b/library/webProfile8/java8/ibmjava/Dockerfile
@@ -41,7 +41,7 @@ RUN /opt/ol/wlp/bin/server create \
     && mkdir /config/configDropins \
     && mkdir /config/configDropins/defaults \
     && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
-    && /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+    && /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
 
 EXPOSE 9080 9443
 

diff --git a/library/webProfile8/java8/ibmsfj/Dockerfile b/library/webProfile8/java8/ibmsfj/Dockerfile
@@ -33,7 +33,7 @@ RUN /opt/ol/wlp/bin/server create \
     && mkdir /config/configDropins \
     && mkdir /config/configDropins/defaults \
     && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
-    && /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/
+    && /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /logs/*
 
 
 EXPOSE 9080 9443