From 73d1db634524acdb4dd408d1878bed921d302e84 Mon Sep 17 00:00:00 2001 From: "dacohen@us.ibm.com" Date: Fri, 11 Oct 2019 15:52:31 -0400 Subject: [PATCH 1/4] review comment --- src/main/liberty/config/jvm.options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/liberty/config/jvm.options b/src/main/liberty/config/jvm.options index 47ddbbe..2ab6452 100644 --- a/src/main/liberty/config/jvm.options +++ b/src/main/liberty/config/jvm.options @@ -1,4 +1,4 @@ #-javaagent:resources/javametrics-agent.jar -#-Dcom.ibm.jsse2.sp800-131=strict +-Dcom.ibm.jsse2.sp800-131=transition -Djdk.tls.client.protocols=TLSv1.2 -Dhttps.protocols=TLSv1.2 From 341f1300d0c173a4c5ea686086930cfe84b75166 Mon Sep 17 00:00:00 2001 From: "dacohen@us.ibm.com" Date: Fri, 11 Oct 2019 16:08:43 -0400 Subject: [PATCH 2/4] as per Bruce --- Dockerfile | 9 ++------- src/main/liberty/config/server.xml | 4 +--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac8ff76..02045a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,14 +23,9 @@ RUN chmod 444 /config/server.xml RUN chmod 444 /config/server.env RUN chmod 444 /config/jvm.options RUN chmod 444 /config/resources/security/cacerts -RUN chmod 444 /config/configDropins/defaults/keystore.xml +RUN rm /config/configDropins/defaults/keystore.xml RUN rm /config/configDropins/defaults/open-default-port.xml -#COPY /src/main/liberty/config/cacerts /opt/ol/wlp/output/defaultServer/resources/security/cacerts -#COPY /target/liberty/wlp/usr/servers/defaultServer/server.xml /opt/ol/wlp/output/defaultServer/server.xml -#COPY --chown=1001:0 /src/main/liberty/config/jvm.options /opt/ol/wlp/output/defaultServer -#RUN chmod 444 /opt/ol/wlp/output/defaultServer/server.xml -#RUN chmod 444 /opt/ol/wlp/output/defaultServer/jvm.options -#RUN chmod 444 /opt/ol/wlp/output/defaultServer/resources/security/cacerts + diff --git a/src/main/liberty/config/server.xml b/src/main/liberty/config/server.xml index bddae11..124dd7c 100644 --- a/src/main/liberty/config/server.xml +++ b/src/main/liberty/config/server.xml @@ -38,9 +38,7 @@ sharedKey="${AESEncryptionKey}"/> - + From b9e142daff0e8a9e380d65aec68700b99975df90 Mon Sep 17 00:00:00 2001 From: "dacohen@us.ibm.com" Date: Fri, 11 Oct 2019 16:22:35 -0400 Subject: [PATCH 3/4] once more --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 02045a2..5b3159e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ COPY LICENSE /licenses/ #FROM open-liberty:webProfile7-java8-openj9 COPY --chown=1001:0 /target/kabanero-cli-service-1.0-SNAPSHOT.war /config/apps COPY --chown=1001:0 /src/main/liberty/config/cacerts /config/resources/security/cacerts -COPY --chown=1001:0 /src/main/liberty/config/keystore.xml /config/configDropins/defaults +#COPY --chown=1001:0 /src/main/liberty/config/keystore.xml /config/configDropins/defaults COPY --chown=1001:0 /target/liberty/wlp/usr/servers/defaultServer/server.xml /config COPY --chown=1001:0 /src/main/liberty/config/jvm.options /config @@ -23,7 +23,7 @@ RUN chmod 444 /config/server.xml RUN chmod 444 /config/server.env RUN chmod 444 /config/jvm.options RUN chmod 444 /config/resources/security/cacerts -RUN rm /config/configDropins/defaults/keystore.xml +#RUN rm /config/configDropins/defaults/keystore.xml RUN rm /config/configDropins/defaults/open-default-port.xml From fd4e0158dec51537d225d87edfc8e81e9fd9575a Mon Sep 17 00:00:00 2001 From: "dacohen@us.ibm.com" Date: Fri, 11 Oct 2019 18:04:28 -0400 Subject: [PATCH 4/4] clean up --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b3159e..6c394e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,6 @@ COPY LICENSE /licenses/ #FROM open-liberty:webProfile7-java8-openj9 COPY --chown=1001:0 /target/kabanero-cli-service-1.0-SNAPSHOT.war /config/apps COPY --chown=1001:0 /src/main/liberty/config/cacerts /config/resources/security/cacerts -#COPY --chown=1001:0 /src/main/liberty/config/keystore.xml /config/configDropins/defaults COPY --chown=1001:0 /target/liberty/wlp/usr/servers/defaultServer/server.xml /config COPY --chown=1001:0 /src/main/liberty/config/jvm.options /config @@ -23,7 +22,6 @@ RUN chmod 444 /config/server.xml RUN chmod 444 /config/server.env RUN chmod 444 /config/jvm.options RUN chmod 444 /config/resources/security/cacerts -#RUN rm /config/configDropins/defaults/keystore.xml RUN rm /config/configDropins/defaults/open-default-port.xml