Update Open Liberty to 19.0.0.5 #5950
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff:diff --git a/open-liberty_javaee7-java8-ibm/Dockerfile b/open-liberty_javaee7-java8-ibm/Dockerfile
index abd3d76..06020a0 100644
--- a/open-liberty_javaee7-java8-ibm/Dockerfile
+++ b/open-liberty_javaee7-java8-ibm/Dockerfile
@@ -2,5 +2,3 @@ FROM open-liberty:kernel-java8-ibm
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_javaee7-java8-ibmsfj/Dockerfile b/open-liberty_javaee7-java8-ibmsfj/Dockerfile
index 8138efc..32985a5 100644
--- a/open-liberty_javaee7-java8-ibmsfj/Dockerfile
+++ b/open-liberty_javaee7-java8-ibmsfj/Dockerfile
@@ -2,5 +2,3 @@ FROM open-liberty:kernel-java8-ibmsfj
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_javaee8-java8-ibmsfj/Dockerfile b/open-liberty_javaee8-java8-ibmsfj/Dockerfile
index 9dc68db..bc4fcb7 100644
--- a/open-liberty_javaee8-java8-ibmsfj/Dockerfile
+++ b/open-liberty_javaee8-java8-ibmsfj/Dockerfile
@@ -1,15 +1,17 @@
FROM ibmjava:8-sfj-alpine
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=657ddda1fc6013ba14dfda51e28834d7ca4a78fe
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=180a2499f42f7469df06bbe39e27a5b0268113f8
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-javaee8/$LIBERTY_VERSION/openliberty-javaee8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker" \
+ BuildLabel="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
-RUN apk add --no-cache wget \
+RUN apk add --no-cache wget openssl \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
&& sha1sum -c /tmp/wlp.zip.sha1 \
@@ -18,7 +20,8 @@ RUN apk add --no-cache wget \
&& rm /tmp/wlp.zip.sha1 \
&& adduser -u 1001 -S -G root -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
- && chmod -R g+rw /opt/ol/wlp
+ && chmod -R g+rw /opt/ol/wlp \
+ && apk del --no-cache wget unzip
# Set Path Shortcuts
ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \
@@ -55,8 +58,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh b/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh
index 9ce84cb..e490317 100755
--- a/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh
+++ b/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
\ No newline at end of file
diff --git a/open-liberty_kernel-java8-ibm/Dockerfile b/open-liberty_kernel-java8-ibm/Dockerfile
index b852e52..23d2cc8 100644
--- a/open-liberty_kernel-java8-ibm/Dockerfile
+++ b/open-liberty_kernel-java8-ibm/Dockerfile
@@ -1,15 +1,17 @@
FROM ibmjava:8-jre
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=d4a9be40d4e1e6e859b836f68379636eb2c19c6d
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=ee0fdbc716e9431b73d483555f0e267f007f0286
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker" \
+ BuildLabel="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
RUN apt-get update \
- && apt-get install -y --no-install-recommends unzip \
+ && apt-get install -y --no-install-recommends unzip openssl \
&& rm -rf /var/lib/apt/lists/* \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
@@ -18,6 +20,7 @@ RUN apt-get update \
&& rm /tmp/wlp.zip \
&& rm /tmp/wlp.zip.sha1 \
&& apt-get remove -y unzip \
+ && apt-get remove -y wget \
&& rm -rf /var/lib/apt/lists/* \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
diff --git a/open-liberty_kernel-java8-ibm/helpers/build/configure.sh b/open-liberty_kernel-java8-ibm/helpers/build/configure.sh
index 4a5cf96..9521ef7 100755
--- a/open-liberty_kernel-java8-ibm/helpers/build/configure.sh
+++ b/open-liberty_kernel-java8-ibm/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
\ No newline at end of file
diff --git a/open-liberty_kernel-java8-ibmsfj/Dockerfile b/open-liberty_kernel-java8-ibmsfj/Dockerfile
index 73f1be2..82396f6 100644
--- a/open-liberty_kernel-java8-ibmsfj/Dockerfile
+++ b/open-liberty_kernel-java8-ibmsfj/Dockerfile
@@ -1,14 +1,16 @@
FROM ibmjava:8-sfj-alpine
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=d4a9be40d4e1e6e859b836f68379636eb2c19c6d
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=ee0fdbc716e9431b73d483555f0e267f007f0286
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker" \
+ BuildLabel="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
-RUN apk add --no-cache wget \
+RUN apk --update add --no-cache wget openssl \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
&& sha1sum -c /tmp/wlp.zip.sha1 \
@@ -17,7 +19,8 @@ RUN apk add --no-cache wget \
&& rm /tmp/wlp.zip.sha1 \
&& adduser -u 1001 -S -G root -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
- && chmod -R g+rw /opt/ol/wlp
+ && chmod -R g+rw /opt/ol/wlp \
+ && apk del --no-cache wget unzip
# Set Path Shortcuts
ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \
@@ -58,7 +61,7 @@ RUN mkdir /logs \
#These settings are needed so that we can run as a different user than 1001 after server warmup
ENV RANDFILE=/tmp/.rnd \
- JVM_ARGS="-Xshareclasses:name=liberty,nonfatal,cacheDir=/output/.classCache/ ${IBM_JAVA_OPTIONS}"
+ IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,nonfatal,cacheDir=/output/.classCache/ ${IBM_JAVA_OPTIONS}"
USER 1001
diff --git a/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh b/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh
index 9ce84cb..e490317 100755
--- a/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh
+++ b/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
\ No newline at end of file
diff --git a/open-liberty_latest/Dockerfile b/open-liberty_latest/Dockerfile
index 1625d8c..c6a1954 100644
--- a/open-liberty_latest/Dockerfile
+++ b/open-liberty_latest/Dockerfile
@@ -1,16 +1,18 @@
FROM ibmjava:8-jre
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=657ddda1fc6013ba14dfda51e28834d7ca4a78fe
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=180a2499f42f7469df06bbe39e27a5b0268113f8
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-javaee8/$LIBERTY_VERSION/openliberty-javaee8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker" \
+ BuildLabel="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
RUN apt-get update \
- && apt-get install -y --no-install-recommends unzip \
+ && apt-get install -y --no-install-recommends unzip openssl \
&& rm -rf /var/lib/apt/lists/* \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
@@ -19,6 +21,7 @@ RUN apt-get update \
&& rm /tmp/wlp.zip \
&& rm /tmp/wlp.zip.sha1 \
&& apt-get remove -y unzip \
+ && apt-get remove -y wget \
&& rm -rf /var/lib/apt/lists/* \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
@@ -60,8 +63,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_latest/helpers/build/configure.sh b/open-liberty_latest/helpers/build/configure.sh
index 4a5cf96..9521ef7 100755
--- a/open-liberty_latest/helpers/build/configure.sh
+++ b/open-liberty_latest/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
\ No newline at end of file
diff --git a/open-liberty_microProfile1-java8-ibm/Dockerfile b/open-liberty_microProfile1-java8-ibm/Dockerfile
index 596450c..424e800 100644
--- a/open-liberty_microProfile1-java8-ibm/Dockerfile
+++ b/open-liberty_microProfile1-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile1-java8-ibmsfj/Dockerfile b/open-liberty_microProfile1-java8-ibmsfj/Dockerfile
index 48ec89c..bb4f570 100644
--- a/open-liberty_microProfile1-java8-ibmsfj/Dockerfile
+++ b/open-liberty_microProfile1-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile2-java8-ibm/Dockerfile b/open-liberty_microProfile2-java8-ibm/Dockerfile
index 4a9baa5..cea4447 100644
--- a/open-liberty_microProfile2-java8-ibm/Dockerfile
+++ b/open-liberty_microProfile2-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile2-java8-ibmsfj/Dockerfile b/open-liberty_microProfile2-java8-ibmsfj/Dockerfile
index a866a65..c205eb2 100644
--- a/open-liberty_microProfile2-java8-ibmsfj/Dockerfile
+++ b/open-liberty_microProfile2-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot1-java8-ibm/Dockerfile b/open-liberty_springBoot1-java8-ibm/Dockerfile
index 7492a17..711565a 100644
--- a/open-liberty_springBoot1-java8-ibm/Dockerfile
+++ b/open-liberty_springBoot1-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibm
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot1-java8-ibmsfj/Dockerfile b/open-liberty_springBoot1-java8-ibmsfj/Dockerfile
index 3e368a8..6cd8efc 100644
--- a/open-liberty_springBoot1-java8-ibmsfj/Dockerfile
+++ b/open-liberty_springBoot1-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibmsfj
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot2-java8-ibm/Dockerfile b/open-liberty_springBoot2-java8-ibm/Dockerfile
index 2ef8eaf..bc99462 100644
--- a/open-liberty_springBoot2-java8-ibm/Dockerfile
+++ b/open-liberty_springBoot2-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibm
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot2-java8-ibmsfj/Dockerfile b/open-liberty_springBoot2-java8-ibmsfj/Dockerfile
index 271e77d..f131ec6 100644
--- a/open-liberty_springBoot2-java8-ibmsfj/Dockerfile
+++ b/open-liberty_springBoot2-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibmsfj
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile7-java8-ibm/Dockerfile b/open-liberty_webProfile7-java8-ibm/Dockerfile
index 646dca2..0678bf1 100644
--- a/open-liberty_webProfile7-java8-ibm/Dockerfile
+++ b/open-liberty_webProfile7-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile7-java8-ibmsfj/Dockerfile b/open-liberty_webProfile7-java8-ibmsfj/Dockerfile
index cf255c8..da62002 100644
--- a/open-liberty_webProfile7-java8-ibmsfj/Dockerfile
+++ b/open-liberty_webProfile7-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile8-java8-ibm/Dockerfile b/open-liberty_webProfile8-java8-ibm/Dockerfile
index f94b763..7e9aad8 100644
--- a/open-liberty_webProfile8-java8-ibm/Dockerfile
+++ b/open-liberty_webProfile8-java8-ibm/Dockerfile
@@ -1,16 +1,18 @@
FROM ibmjava:8-jre
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=64c39d499297823ff2b56f8a7108b57da3a13fc4
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=d0b7dfe4f5f2f4c7b6280081c123aab3fc90fdcc
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-webProfile8/$LIBERTY_VERSION/openliberty-webProfile8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker" \
+ BuildLabel="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
RUN apt-get update \
- && apt-get install -y --no-install-recommends unzip \
+ && apt-get install -y --no-install-recommends unzip openssl \
&& rm -rf /var/lib/apt/lists/* \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
@@ -19,6 +21,7 @@ RUN apt-get update \
&& rm /tmp/wlp.zip \
&& rm /tmp/wlp.zip.sha1 \
&& apt-get remove -y unzip \
+ && apt-get remove -y wget \
&& rm -rf /var/lib/apt/lists/* \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
@@ -59,8 +62,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh b/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh
index 4a5cf96..9521ef7 100755
--- a/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh
+++ b/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
\ No newline at end of file
diff --git a/open-liberty_webProfile8-java8-ibmsfj/Dockerfile b/open-liberty_webProfile8-java8-ibmsfj/Dockerfile
index e6941f0..e9a5fd9 100644
--- a/open-liberty_webProfile8-java8-ibmsfj/Dockerfile
+++ b/open-liberty_webProfile8-java8-ibmsfj/Dockerfile
@@ -1,15 +1,17 @@
FROM ibmjava:8-sfj-alpine
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=64c39d499297823ff2b56f8a7108b57da3a13fc4
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=d0b7dfe4f5f2f4c7b6280081c123aab3fc90fdcc
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-webProfile8/$LIBERTY_VERSION/openliberty-webProfile8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker" \
+ BuildLabel="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
-RUN apk add --no-cache wget \
+RUN apk add --no-cache wget openssl \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
&& sha1sum -c /tmp/wlp.zip.sha1 \
@@ -18,7 +20,8 @@ RUN apk add --no-cache wget \
&& rm /tmp/wlp.zip.sha1 \
&& adduser -u 1001 -S -G root -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
- && chmod -R g+rw /opt/ol/wlp
+ && chmod -R g+rw /opt/ol/wlp \
+ && apk del --no-cache wget unzip
# Set Path Shortcuts
ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \
@@ -55,8 +58,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh b/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh
index 9ce84cb..e490317 100755
--- a/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh
+++ b/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+RUN /opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
\ No newline at end of file |
|
A few comments:
If you're doing
Isn't this a shell script? Is
These labels ought to all be updated to conform to https://github.com/opencontainers/image-spec/blob/v1.0.1/annotations.md -- reverse DNS, etc. |
This was referenced May 28, 2019
|
@tianon thanks for your comments. We've made the recommended updates, let us know if you have any more concerns. |
Diff:diff --git a/open-liberty_javaee7-java8-ibm/Dockerfile b/open-liberty_javaee7-java8-ibm/Dockerfile
index abd3d76..06020a0 100644
--- a/open-liberty_javaee7-java8-ibm/Dockerfile
+++ b/open-liberty_javaee7-java8-ibm/Dockerfile
@@ -2,5 +2,3 @@ FROM open-liberty:kernel-java8-ibm
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_javaee7-java8-ibmsfj/Dockerfile b/open-liberty_javaee7-java8-ibmsfj/Dockerfile
index 8138efc..32985a5 100644
--- a/open-liberty_javaee7-java8-ibmsfj/Dockerfile
+++ b/open-liberty_javaee7-java8-ibmsfj/Dockerfile
@@ -2,5 +2,3 @@ FROM open-liberty:kernel-java8-ibmsfj
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_javaee8-java8-ibmsfj/Dockerfile b/open-liberty_javaee8-java8-ibmsfj/Dockerfile
index 9dc68db..55632fe 100644
--- a/open-liberty_javaee8-java8-ibmsfj/Dockerfile
+++ b/open-liberty_javaee8-java8-ibmsfj/Dockerfile
@@ -1,15 +1,20 @@
FROM ibmjava:8-sfj-alpine
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=657ddda1fc6013ba14dfda51e28834d7ca4a78fe
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=180a2499f42f7469df06bbe39e27a5b0268113f8
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-javaee8/$LIBERTY_VERSION/openliberty-javaee8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
-RUN apk add --no-cache wget \
+RUN apk add --no-cache wget openssl \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
&& sha1sum -c /tmp/wlp.zip.sha1 \
@@ -18,7 +23,8 @@ RUN apk add --no-cache wget \
&& rm /tmp/wlp.zip.sha1 \
&& adduser -u 1001 -S -G root -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
- && chmod -R g+rw /opt/ol/wlp
+ && chmod -R g+rw /opt/ol/wlp \
+ && apk del --no-cache wget unzip
# Set Path Shortcuts
ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \
@@ -55,8 +61,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh b/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh
index 9ce84cb..721d43b 100755
--- a/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh
+++ b/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_kernel-java8-ibm/Dockerfile b/open-liberty_kernel-java8-ibm/Dockerfile
index b852e52..819032e 100644
--- a/open-liberty_kernel-java8-ibm/Dockerfile
+++ b/open-liberty_kernel-java8-ibm/Dockerfile
@@ -1,15 +1,20 @@
FROM ibmjava:8-jre
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=d4a9be40d4e1e6e859b836f68379636eb2c19c6d
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=ee0fdbc716e9431b73d483555f0e267f007f0286
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
RUN apt-get update \
- && apt-get install -y --no-install-recommends unzip \
+ && apt-get install -y --no-install-recommends unzip openssl \
&& rm -rf /var/lib/apt/lists/* \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
@@ -18,6 +23,7 @@ RUN apt-get update \
&& rm /tmp/wlp.zip \
&& rm /tmp/wlp.zip.sha1 \
&& apt-get remove -y unzip \
+ && apt-get remove -y wget \
&& rm -rf /var/lib/apt/lists/* \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
diff --git a/open-liberty_kernel-java8-ibm/helpers/build/configure.sh b/open-liberty_kernel-java8-ibm/helpers/build/configure.sh
index 4a5cf96..29e2565 100755
--- a/open-liberty_kernel-java8-ibm/helpers/build/configure.sh
+++ b/open-liberty_kernel-java8-ibm/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_kernel-java8-ibmsfj/Dockerfile b/open-liberty_kernel-java8-ibmsfj/Dockerfile
index 73f1be2..790e866 100644
--- a/open-liberty_kernel-java8-ibmsfj/Dockerfile
+++ b/open-liberty_kernel-java8-ibmsfj/Dockerfile
@@ -1,14 +1,19 @@
FROM ibmjava:8-sfj-alpine
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=d4a9be40d4e1e6e859b836f68379636eb2c19c6d
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=ee0fdbc716e9431b73d483555f0e267f007f0286
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
-RUN apk add --no-cache wget \
+RUN apk add --no-cache wget openssl \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
&& sha1sum -c /tmp/wlp.zip.sha1 \
@@ -17,7 +22,8 @@ RUN apk add --no-cache wget \
&& rm /tmp/wlp.zip.sha1 \
&& adduser -u 1001 -S -G root -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
- && chmod -R g+rw /opt/ol/wlp
+ && chmod -R g+rw /opt/ol/wlp \
+ && apk del --no-cache wget unzip
# Set Path Shortcuts
ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \
@@ -58,7 +64,7 @@ RUN mkdir /logs \
#These settings are needed so that we can run as a different user than 1001 after server warmup
ENV RANDFILE=/tmp/.rnd \
- JVM_ARGS="-Xshareclasses:name=liberty,nonfatal,cacheDir=/output/.classCache/ ${IBM_JAVA_OPTIONS}"
+ IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,nonfatal,cacheDir=/output/.classCache/ ${IBM_JAVA_OPTIONS}"
USER 1001
diff --git a/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh b/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh
index 9ce84cb..721d43b 100755
--- a/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh
+++ b/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_latest/Dockerfile b/open-liberty_latest/Dockerfile
index 1625d8c..67dbf39 100644
--- a/open-liberty_latest/Dockerfile
+++ b/open-liberty_latest/Dockerfile
@@ -1,16 +1,21 @@
FROM ibmjava:8-jre
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=657ddda1fc6013ba14dfda51e28834d7ca4a78fe
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=180a2499f42f7469df06bbe39e27a5b0268113f8
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-javaee8/$LIBERTY_VERSION/openliberty-javaee8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
RUN apt-get update \
- && apt-get install -y --no-install-recommends unzip \
+ && apt-get install -y --no-install-recommends unzip openssl \
&& rm -rf /var/lib/apt/lists/* \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
@@ -19,6 +24,7 @@ RUN apt-get update \
&& rm /tmp/wlp.zip \
&& rm /tmp/wlp.zip.sha1 \
&& apt-get remove -y unzip \
+ && apt-get remove -y wget \
&& rm -rf /var/lib/apt/lists/* \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
@@ -60,8 +66,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_latest/helpers/build/configure.sh b/open-liberty_latest/helpers/build/configure.sh
index 4a5cf96..29e2565 100755
--- a/open-liberty_latest/helpers/build/configure.sh
+++ b/open-liberty_latest/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile1-java8-ibm/Dockerfile b/open-liberty_microProfile1-java8-ibm/Dockerfile
index 596450c..424e800 100644
--- a/open-liberty_microProfile1-java8-ibm/Dockerfile
+++ b/open-liberty_microProfile1-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile1-java8-ibmsfj/Dockerfile b/open-liberty_microProfile1-java8-ibmsfj/Dockerfile
index 48ec89c..bb4f570 100644
--- a/open-liberty_microProfile1-java8-ibmsfj/Dockerfile
+++ b/open-liberty_microProfile1-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile2-java8-ibm/Dockerfile b/open-liberty_microProfile2-java8-ibm/Dockerfile
index 4a9baa5..cea4447 100644
--- a/open-liberty_microProfile2-java8-ibm/Dockerfile
+++ b/open-liberty_microProfile2-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile2-java8-ibmsfj/Dockerfile b/open-liberty_microProfile2-java8-ibmsfj/Dockerfile
index a866a65..c205eb2 100644
--- a/open-liberty_microProfile2-java8-ibmsfj/Dockerfile
+++ b/open-liberty_microProfile2-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot1-java8-ibm/Dockerfile b/open-liberty_springBoot1-java8-ibm/Dockerfile
index 7492a17..711565a 100644
--- a/open-liberty_springBoot1-java8-ibm/Dockerfile
+++ b/open-liberty_springBoot1-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibm
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot1-java8-ibmsfj/Dockerfile b/open-liberty_springBoot1-java8-ibmsfj/Dockerfile
index 3e368a8..6cd8efc 100644
--- a/open-liberty_springBoot1-java8-ibmsfj/Dockerfile
+++ b/open-liberty_springBoot1-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibmsfj
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot2-java8-ibm/Dockerfile b/open-liberty_springBoot2-java8-ibm/Dockerfile
index 2ef8eaf..bc99462 100644
--- a/open-liberty_springBoot2-java8-ibm/Dockerfile
+++ b/open-liberty_springBoot2-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibm
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot2-java8-ibmsfj/Dockerfile b/open-liberty_springBoot2-java8-ibmsfj/Dockerfile
index 271e77d..f131ec6 100644
--- a/open-liberty_springBoot2-java8-ibmsfj/Dockerfile
+++ b/open-liberty_springBoot2-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibmsfj
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile7-java8-ibm/Dockerfile b/open-liberty_webProfile7-java8-ibm/Dockerfile
index 646dca2..0678bf1 100644
--- a/open-liberty_webProfile7-java8-ibm/Dockerfile
+++ b/open-liberty_webProfile7-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile7-java8-ibmsfj/Dockerfile b/open-liberty_webProfile7-java8-ibmsfj/Dockerfile
index cf255c8..da62002 100644
--- a/open-liberty_webProfile7-java8-ibmsfj/Dockerfile
+++ b/open-liberty_webProfile7-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile8-java8-ibm/Dockerfile b/open-liberty_webProfile8-java8-ibm/Dockerfile
index f94b763..8c4e5da 100644
--- a/open-liberty_webProfile8-java8-ibm/Dockerfile
+++ b/open-liberty_webProfile8-java8-ibm/Dockerfile
@@ -1,16 +1,21 @@
FROM ibmjava:8-jre
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=64c39d499297823ff2b56f8a7108b57da3a13fc4
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=d0b7dfe4f5f2f4c7b6280081c123aab3fc90fdcc
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-webProfile8/$LIBERTY_VERSION/openliberty-webProfile8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
RUN apt-get update \
- && apt-get install -y --no-install-recommends unzip \
+ && apt-get install -y --no-install-recommends unzip openssl \
&& rm -rf /var/lib/apt/lists/* \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
@@ -19,6 +24,7 @@ RUN apt-get update \
&& rm /tmp/wlp.zip \
&& rm /tmp/wlp.zip.sha1 \
&& apt-get remove -y unzip \
+ && apt-get remove -y wget \
&& rm -rf /var/lib/apt/lists/* \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
@@ -59,8 +65,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh b/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh
index 4a5cf96..29e2565 100755
--- a/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh
+++ b/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile8-java8-ibmsfj/Dockerfile b/open-liberty_webProfile8-java8-ibmsfj/Dockerfile
index e6941f0..46b4837 100644
--- a/open-liberty_webProfile8-java8-ibmsfj/Dockerfile
+++ b/open-liberty_webProfile8-java8-ibmsfj/Dockerfile
@@ -1,15 +1,20 @@
FROM ibmjava:8-sfj-alpine
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=64c39d499297823ff2b56f8a7108b57da3a13fc4
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=d0b7dfe4f5f2f4c7b6280081c123aab3fc90fdcc
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-webProfile8/$LIBERTY_VERSION/openliberty-webProfile8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
-RUN apk add --no-cache wget \
+RUN apk add --no-cache wget openssl \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
&& sha1sum -c /tmp/wlp.zip.sha1 \
@@ -18,7 +23,8 @@ RUN apk add --no-cache wget \
&& rm /tmp/wlp.zip.sha1 \
&& adduser -u 1001 -S -G root -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
- && chmod -R g+rw /opt/ol/wlp
+ && chmod -R g+rw /opt/ol/wlp \
+ && apk del --no-cache wget unzip
# Set Path Shortcuts
ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \
@@ -55,8 +61,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh b/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh
index 9ce84cb..721d43b 100755
--- a/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh
+++ b/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/* |
|
It seems that some of the images are unable to complete the Build test of #5950; 921ece9; $ bashbrew build open-liberty:kernel
Using bashbrew/cache:f85d45f2c7b71311acd6e7648e7bfd9fd225e65a3a3ec6d00e5aaf51bdd6bb4b (open-liberty:kernel)
Tagging open-liberty:kernel
Tagging open-liberty:kernel-java8-ibm
$ test/run.sh open-liberty:kernel
testing open-liberty:kernel
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]............open-liberty:kernel failed to accept connections in a reasonable amount of time!
++ docker logs d89cdea17eb3148cd88133823a7706f3da536de478e4028654402d91b89e83da
Launching defaultServer (Open Liberty 19.0.0.5/wlp-1.0.28.cl190520190522-2227) on IBM J9 VM, version 8.0.5.36 - pxa6480sr5fp36-20190510_01(SR5 FP36) (en_US)
[AUDIT ] CWWKE0001I: The server defaultServer has been launched.
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/open-default-port.xml
[AUDIT ] CWWKZ0058I: Monitoring dropins for applications.
[AUDIT ] CWWKF0012I: The server installed the following features: [el-3.0, jsp-2.3, servlet-3.1].
[AUDIT ] CWWKF0011I: The defaultServer server is ready to run a smarter planet. The defaultServer server started in 3.818 seconds.
failed
$ bashbrew build open-liberty:kernel-java8-ibmsfj
Using bashbrew/cache:91533933e990628077ac98e4add6fb505fbe2db59adaf842300bd4afe0f0acde (open-liberty:kernel-java8-ibmsfj)
Tagging open-liberty:kernel-java8-ibmsfj
$ test/run.sh open-liberty:kernel-java8-ibmsfj
testing open-liberty:kernel-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:webProfile8
Using bashbrew/cache:76b571b0d61049b1c15b019ba270a342bdd194ca28ad14829e6a8afbe8bfd464 (open-liberty:webProfile8)
Tagging open-liberty:webProfile8
Tagging open-liberty:webProfile8-java8-ibm
$ test/run.sh open-liberty:webProfile8
testing open-liberty:webProfile8
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]............open-liberty:webProfile8 failed to accept connections in a reasonable amount of time!
++ docker logs fbec9c47ac2621b83e02f56f27ed12700ef8744127f0be35b64ffa6449e7d19b
Launching defaultServer (Open Liberty 19.0.0.5/wlp-1.0.28.cl190520190522-2227) on IBM J9 VM, version 8.0.5.36 - pxa6480sr5fp36-20190510_01(SR5 FP36) (en_US)
[AUDIT ] CWWKE0001I: The server defaultServer has been launched.
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/keystore.xml
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/open-default-port.xml
[AUDIT ] CWWKZ0058I: Monitoring dropins for applications.
[AUDIT ] CWWKS4104A: LTPA keys created in 0.946 seconds. LTPA key file: /opt/ol/wlp/output/defaultServer/resources/security/ltpa.keys
[AUDIT ] CWWKF0012I: The server installed the following features: [appSecurity-2.0, appSecurity-3.0, beanValidation-2.0, cdi-2.0, distributedMap-1.0, ejbLite-3.2, el-3.0, jaspic-1.1, jaxrs-2.1, jaxrsClient-2.1, jdbc-4.2, jndi-1.0, jpa-2.2, jpaContainer-2.2, jsf-2.3, jsonb-1.0, jsonp-1.1, jsp-2.3, managedBeans-1.0, servlet-4.0, ssl-1.0, webProfile-8.0, websocket-1.1].
[AUDIT ] CWWKF0011I: The defaultServer server is ready to run a smarter planet. The defaultServer server started in 6.532 seconds.
[AUDIT ] CWPKI0803A: SSL certificate created in 2.306 seconds. SSL key file: /opt/ol/wlp/output/defaultServer/resources/security/key.p12
failed
$ bashbrew build open-liberty:webProfile8-java8-ibmsfj
Using bashbrew/cache:062e3546a01be8fb85da1dcc1031ff02309df89b9cd47e0eeb3e1bd573a66561 (open-liberty:webProfile8-java8-ibmsfj)
Tagging open-liberty:webProfile8-java8-ibmsfj
$ test/run.sh open-liberty:webProfile8-java8-ibmsfj
testing open-liberty:webProfile8-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:javaee8
Using bashbrew/cache:eb9062ad3d2e70bfa909f86148b5e49ed7f9fb9bd5fbd10a20babe6011401779 (open-liberty:javaee8)
Tagging open-liberty:javaee8
Tagging open-liberty:javaee8-java8-ibm
Tagging open-liberty:latest
$ test/run.sh open-liberty:javaee8
testing open-liberty:javaee8
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]............open-liberty:javaee8 failed to accept connections in a reasonable amount of time!
++ docker logs 919b44e98787ff3ebaa5eff04e96b14fb3aec47a9ab4a549c7671e93954e9786
Launching defaultServer (Open Liberty 19.0.0.5/wlp-1.0.28.cl190520190522-2227) on IBM J9 VM, version 8.0.5.36 - pxa6480sr5fp36-20190510_01(SR5 FP36) (en_US)
[AUDIT ] CWWKE0001I: The server defaultServer has been launched.
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/keystore.xml
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/open-default-port.xml
[WARNING ] CWWKS3103W: There are no users defined for the BasicRegistry configuration of ID com.ibm.ws.security.registry.basic.config[basic].
[AUDIT ] CWWKZ0058I: Monitoring dropins for applications.
[AUDIT ] CWWKS4104A: LTPA keys created in 0.659 seconds. LTPA key file: /opt/ol/wlp/output/defaultServer/resources/security/ltpa.keys
[AUDIT ] CWPKI0803A: SSL certificate created in 3.366 seconds. SSL key file: /opt/ol/wlp/output/defaultServer/resources/security/key.p12
[AUDIT ] CWWKI0001I: The CORBA name server is now available at corbaloc:iiop:localhost:2809/NameService.
[AUDIT ] CWWKF0012I: The server installed the following features: [appClientSupport-1.0, appSecurity-2.0, appSecurity-3.0, batch-1.0, beanValidation-2.0, cdi-2.0, concurrent-1.0, distributedMap-1.0, ejb-3.2, ejbHome-3.2, ejbLite-3.2, ejbPersistentTimer-3.2, ejbRemote-3.2, el-3.0, j2eeManagement-1.1, jacc-1.5, jaspic-1.1, javaMail-1.6, javaee-8.0, jaxb-2.2, jaxrs-2.1, jaxrsClient-2.1, jaxws-2.2, jca-1.7, jcaInboundSecurity-1.0, jdbc-4.2, jms-2.0, jndi-1.0, jpa-2.2, jpaContainer-2.2, jsf-2.3, jsonb-1.0, jsonp-1.1, jsp-2.3, managedBeans-1.0, mdb-3.2, servlet-4.0, ssl-1.0, wasJmsClient-2.0, wasJmsSecurity-1.0, wasJmsServer-1.0, webProfile-8.0, websocket-1.1].
[AUDIT ] CWWKF0011I: The defaultServer server is ready to run a smarter planet. The defaultServer server started in 23.043 seconds.
failed
$ bashbrew build open-liberty:javaee8-java8-ibmsfj
Using bashbrew/cache:ede87a82728fbdbe562b2f8b09ec07cb1a4b4ad5e378308b3aa78b88d2d9eff9 (open-liberty:javaee8-java8-ibmsfj)
Tagging open-liberty:javaee8-java8-ibmsfj
$ test/run.sh open-liberty:javaee8-java8-ibmsfj
testing open-liberty:javaee8-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]......passed
$ bashbrew build open-liberty:microProfile1
Using bashbrew/cache:853d4e51c00e540f27b7a320ac8ba1f2d69b3714c3bd90c37f561c21f96a9a78 (open-liberty:microProfile1)
Tagging open-liberty:microProfile1
Tagging open-liberty:microProfile1-java8-ibm
$ test/run.sh open-liberty:microProfile1
testing open-liberty:microProfile1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]............open-liberty:microProfile1 failed to accept connections in a reasonable amount of time!
++ docker logs 14d42f411eb1b9c44d5d9cc98e18de702d4074c463d81975732bb0cf2d097b88
Launching defaultServer (Open Liberty 19.0.0.5/wlp-1.0.28.cl190520190522-2227) on IBM J9 VM, version 8.0.5.36 - pxa6480sr5fp36-20190510_01(SR5 FP36) (en_US)
[AUDIT ] CWWKE0001I: The server defaultServer has been launched.
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/open-default-port.xml
[AUDIT ] CWWKZ0058I: Monitoring dropins for applications.
[AUDIT ] CWPKI0820A: The default keystore has been created using the 'keystore_password' environment variable.
[AUDIT ] CWWKS4104A: LTPA keys created in 0.953 seconds. LTPA key file: /opt/ol/wlp/output/defaultServer/resources/security/ltpa.keys
[AUDIT ] CWWKF0012I: The server installed the following features: [appSecurity-2.0, cdi-1.2, concurrent-1.0, distributedMap-1.0, jaxrs-2.0, jaxrsClient-2.0, jndi-1.0, json-1.0, jsonp-1.0, jwt-1.0, microProfile-1.4, mpConfig-1.3, mpFaultTolerance-1.1, mpHealth-1.0, mpJwt-1.1, mpMetrics-1.1, mpOpenAPI-1.0, mpOpenTracing-1.1, mpRestClient-1.1, opentracing-1.1, servlet-3.1, ssl-1.0].
[AUDIT ] CWWKF0011I: The defaultServer server is ready to run a smarter planet. The defaultServer server started in 6.223 seconds.
[AUDIT ] CWWKT0016I: Web application available (default_host): http://14d42f411eb1:9080/metrics/
[AUDIT ] CWWKT0016I: Web application available (default_host): http://14d42f411eb1:9080/openapi/ui/
[AUDIT ] CWWKT0016I: Web application available (default_host): http://14d42f411eb1:9080/ibm/api/
[AUDIT ] CWWKT0016I: Web application available (default_host): http://14d42f411eb1:9080/health/
[AUDIT ] CWWKT0016I: Web application available (default_host): http://14d42f411eb1:9080/jwt/
[AUDIT ] CWWKT0016I: Web application available (default_host): http://14d42f411eb1:9080/openapi/
[AUDIT ] CWPKI0803A: SSL certificate created in 2.078 seconds. SSL key file: /opt/ol/wlp/output/defaultServer/resources/security/key.p12
failed
$ bashbrew build open-liberty:microProfile1-java8-ibmsfj
Using bashbrew/cache:5384ca29ac9dec2054e4bc49922746ed79a411b349d4d3e3f4b18bc567eeaf1b (open-liberty:microProfile1-java8-ibmsfj)
Tagging open-liberty:microProfile1-java8-ibmsfj
$ test/run.sh open-liberty:microProfile1-java8-ibmsfj
testing open-liberty:microProfile1-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:microProfile2
Using bashbrew/cache:43df2336c66a93659e6b9a3ae6f280c705deb279d082a234f5324ffd25622003 (open-liberty:microProfile2)
Tagging open-liberty:microProfile2
Tagging open-liberty:microProfile2-java8-ibm
$ test/run.sh open-liberty:microProfile2
testing open-liberty:microProfile2
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]............open-liberty:microProfile2 failed to accept connections in a reasonable amount of time!
++ docker logs 2352ff04092f182f9deffceec7bfe21729d9a1d8a85df48a4cb998ee2bf702bc
Launching defaultServer (Open Liberty 19.0.0.5/wlp-1.0.28.cl190520190522-2227) on IBM J9 VM, version 8.0.5.36 - pxa6480sr5fp36-20190510_01(SR5 FP36) (en_US)
[AUDIT ] CWWKE0001I: The server defaultServer has been launched.
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/open-default-port.xml
[AUDIT ] CWWKZ0058I: Monitoring dropins for applications.
[AUDIT ] CWPKI0820A: The default keystore has been created using the 'keystore_password' environment variable.
[AUDIT ] CWWKS4104A: LTPA keys created in 0.824 seconds. LTPA key file: /opt/ol/wlp/output/defaultServer/resources/security/ltpa.keys
[AUDIT ] CWWKF0012I: The server installed the following features: [appSecurity-2.0, cdi-2.0, concurrent-1.0, distributedMap-1.0, jaxrs-2.1, jaxrsClient-2.1, jndi-1.0, json-1.0, jsonb-1.0, jsonp-1.1, jwt-1.0, microProfile-2.2, mpConfig-1.3, mpFaultTolerance-2.0, mpHealth-1.0, mpJwt-1.1, mpMetrics-1.1, mpOpenAPI-1.1, mpOpenTracing-1.3, mpRestClient-1.2, opentracing-1.3, servlet-4.0, ssl-1.0].
[AUDIT ] CWWKF0011I: The defaultServer server is ready to run a smarter planet. The defaultServer server started in 6.382 seconds.
[AUDIT ] CWWKT0016I: Web application available (default_host): http://2352ff04092f:9080/health/
[AUDIT ] CWWKT0016I: Web application available (default_host): http://2352ff04092f:9080/ibm/api/
[AUDIT ] CWWKT0016I: Web application available (default_host): http://2352ff04092f:9080/metrics/
[AUDIT ] CWWKT0016I: Web application available (default_host): http://2352ff04092f:9080/openapi/ui/
[AUDIT ] CWWKT0016I: Web application available (default_host): http://2352ff04092f:9080/jwt/
[AUDIT ] CWWKT0016I: Web application available (default_host): http://2352ff04092f:9080/openapi/
[AUDIT ] CWPKI0803A: SSL certificate created in 2.905 seconds. SSL key file: /opt/ol/wlp/output/defaultServer/resources/security/key.p12
failed
$ bashbrew build open-liberty:microProfile2-java8-ibmsfj
Using bashbrew/cache:566b2f10b84bb62222cacc3363baef904d4acac0405f66120bd19e3b38aa937b (open-liberty:microProfile2-java8-ibmsfj)
Tagging open-liberty:microProfile2-java8-ibmsfj
$ test/run.sh open-liberty:microProfile2-java8-ibmsfj
testing open-liberty:microProfile2-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:springBoot2
Using bashbrew/cache:53e77558210822e9594792a57b91d149057ef3c27f39fe480717ff1b455ca788 (open-liberty:springBoot2)
Tagging open-liberty:springBoot2
Tagging open-liberty:springBoot2-java8-ibm
$ test/run.sh open-liberty:springBoot2
testing open-liberty:springBoot2
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]............open-liberty:springBoot2 failed to accept connections in a reasonable amount of time!
++ docker logs cfe2cc8ccae66d31773838f1242d5d38d5b281743e248e948d8e63caca3ee3a8
Launching defaultServer (Open Liberty 19.0.0.5/wlp-1.0.28.cl190520190522-2227) on IBM J9 VM, version 8.0.5.36 - pxa6480sr5fp36-20190510_01(SR5 FP36) (en_US)
[AUDIT ] CWWKE0001I: The server defaultServer has been launched.
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/open-default-port.xml
[AUDIT ] CWWKZ0058I: Monitoring dropins for applications.
[AUDIT ] CWPKI0820A: The default keystore has been created using the 'keystore_password' environment variable.
[AUDIT ] CWWKF0012I: The server installed the following features: [el-3.0, jsp-2.3, servlet-4.0, springBoot-2.0, ssl-1.0, transportSecurity-1.0, websocket-1.1].
[AUDIT ] CWWKF0011I: The defaultServer server is ready to run a smarter planet. The defaultServer server started in 3.602 seconds.
[AUDIT ] CWPKI0803A: SSL certificate created in 2.280 seconds. SSL key file: /opt/ol/wlp/output/defaultServer/resources/security/key.p12
failed
$ bashbrew build open-liberty:springBoot2-java8-ibmsfj
Using bashbrew/cache:604fcf51e7084f8f7617790a90c6eb9d07c1c0b60020bdea3d94990c700ff48d (open-liberty:springBoot2-java8-ibmsfj)
Tagging open-liberty:springBoot2-java8-ibmsfj
$ test/run.sh open-liberty:springBoot2-java8-ibmsfj
testing open-liberty:springBoot2-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:webProfile7
Using bashbrew/cache:ff06881ec8f2eb7c59dd3c3c0d68e9bbe704f4b9dc70182284d7e20077456c72 (open-liberty:webProfile7)
Tagging open-liberty:webProfile7
Tagging open-liberty:webProfile7-java8-ibm
$ test/run.sh open-liberty:webProfile7
testing open-liberty:webProfile7
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]............open-liberty:webProfile7 failed to accept connections in a reasonable amount of time!
++ docker logs 6ffe4f0ec428dac8e6d83516702b57e7915e34057459db493b282d1e0d787bfb
Launching defaultServer (Open Liberty 19.0.0.5/wlp-1.0.28.cl190520190522-2227) on IBM J9 VM, version 8.0.5.36 - pxa6480sr5fp36-20190510_01(SR5 FP36) (en_US)
[AUDIT ] CWWKE0001I: The server defaultServer has been launched.
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/open-default-port.xml
[AUDIT ] CWPKI0820A: The default keystore has been created using the 'keystore_password' environment variable.
[AUDIT ] CWWKZ0058I: Monitoring dropins for applications.
[AUDIT ] CWWKS4104A: LTPA keys created in 0.901 seconds. LTPA key file: /opt/ol/wlp/output/defaultServer/resources/security/ltpa.keys
[AUDIT ] CWWKF0012I: The server installed the following features: [appSecurity-2.0, beanValidation-1.1, cdi-1.2, distributedMap-1.0, ejbLite-3.2, el-3.0, jaxrs-2.0, jaxrsClient-2.0, jdbc-4.1, jndi-1.0, jpa-2.1, jpaContainer-2.1, jsf-2.2, json-1.0, jsonp-1.0, jsp-2.3, managedBeans-1.0, servlet-3.1, ssl-1.0, webProfile-7.0, websocket-1.1].
[AUDIT ] CWWKF0011I: The defaultServer server is ready to run a smarter planet. The defaultServer server started in 6.531 seconds.
[AUDIT ] CWPKI0803A: SSL certificate created in 2.269 seconds. SSL key file: /opt/ol/wlp/output/defaultServer/resources/security/key.p12
failed
$ bashbrew build open-liberty:webProfile7-java8-ibmsfj
Using bashbrew/cache:04b87d9a994fea2ee33a20a925321c414791a6c5aedb09a4a7443c7958655840 (open-liberty:webProfile7-java8-ibmsfj)
Tagging open-liberty:webProfile7-java8-ibmsfj
$ test/run.sh open-liberty:webProfile7-java8-ibmsfj
testing open-liberty:webProfile7-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:javaee7
Using bashbrew/cache:645e224c976d107b0147928a67117ee0c1cd2c115632f8ad5a33ef7a9fb9cab7 (open-liberty:javaee7)
Tagging open-liberty:javaee7
Tagging open-liberty:javaee7-java8-ibm
$ test/run.sh open-liberty:javaee7
testing open-liberty:javaee7
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]............open-liberty:javaee7 failed to accept connections in a reasonable amount of time!
++ docker logs 7e25d6584e239c0c52d5868c075cba40f447afe9c6cd8c08c1bd8ed4fd32ce5a
Launching defaultServer (Open Liberty 19.0.0.5/wlp-1.0.28.cl190520190522-2227) on IBM J9 VM, version 8.0.5.36 - pxa6480sr5fp36-20190510_01(SR5 FP36) (en_US)
[AUDIT ] CWWKE0001I: The server defaultServer has been launched.
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/keystore.xml
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/open-default-port.xml
[WARNING ] CWWKS3103W: There are no users defined for the BasicRegistry configuration of ID com.ibm.ws.security.registry.basic.config[basic].
[AUDIT ] CWWKZ0058I: Monitoring dropins for applications.
[AUDIT ] CWWKS4104A: LTPA keys created in 0.865 seconds. LTPA key file: /opt/ol/wlp/output/defaultServer/resources/security/ltpa.keys
[AUDIT ] CWPKI0803A: SSL certificate created in 1.890 seconds. SSL key file: /opt/ol/wlp/output/defaultServer/resources/security/key.p12
[AUDIT ] CWWKI0001I: The CORBA name server is now available at corbaloc:iiop:localhost:2809/NameService.
[AUDIT ] CWWKF0012I: The server installed the following features: [appClientSupport-1.0, appSecurity-2.0, batch-1.0, beanValidation-1.1, cdi-1.2, concurrent-1.0, distributedMap-1.0, ejb-3.2, ejbHome-3.2, ejbLite-3.2, ejbPersistentTimer-3.2, ejbRemote-3.2, el-3.0, j2eeManagement-1.1, jacc-1.5, jaspic-1.1, javaMail-1.5, javaee-7.0, jaxb-2.2, jaxrs-2.0, jaxrsClient-2.0, jaxws-2.2, jca-1.7, jcaInboundSecurity-1.0, jdbc-4.1, jms-2.0, jndi-1.0, jpa-2.1, jpaContainer-2.1, jsf-2.2, json-1.0, jsonp-1.0, jsp-2.3, managedBeans-1.0, mdb-3.2, servlet-3.1, ssl-1.0, wasJmsClient-2.0, wasJmsSecurity-1.0, wasJmsServer-1.0, webProfile-7.0, websocket-1.1].
[AUDIT ] CWWKF0011I: The defaultServer server is ready to run a smarter planet. The defaultServer server started in 8.436 seconds.
failed
$ bashbrew build open-liberty:javaee7-java8-ibmsfj
Using bashbrew/cache:011899a00cefd3e0cb2291926378463b8553c15d7a91fbd49bd9562cf8acf9f8 (open-liberty:javaee7-java8-ibmsfj)
Tagging open-liberty:javaee7-java8-ibmsfj
$ test/run.sh open-liberty:javaee7-java8-ibmsfj
testing open-liberty:javaee7-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]......passed
$ bashbrew build open-liberty:springBoot1
Using bashbrew/cache:0b53d310bf922496948921e96aa42092cfc6c93286ffe3b6a3d4a5a92e521dc6 (open-liberty:springBoot1)
Tagging open-liberty:springBoot1
Tagging open-liberty:springBoot1-java8-ibm
$ test/run.sh open-liberty:springBoot1
testing open-liberty:springBoot1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]............open-liberty:springBoot1 failed to accept connections in a reasonable amount of time!
++ docker logs 695d713408c7fa2010c1127ff91618eb295cb67cdc16b41363bdbaeb62da97d6
Launching defaultServer (Open Liberty 19.0.0.5/wlp-1.0.28.cl190520190522-2227) on IBM J9 VM, version 8.0.5.36 - pxa6480sr5fp36-20190510_01(SR5 FP36) (en_US)
[AUDIT ] CWWKE0001I: The server defaultServer has been launched.
[AUDIT ] CWWKG0093A: Processing configuration drop-ins resource: /opt/ol/wlp/usr/servers/defaultServer/configDropins/defaults/open-default-port.xml
[AUDIT ] CWWKZ0058I: Monitoring dropins for applications.
[AUDIT ] CWPKI0820A: The default keystore has been created using the 'keystore_password' environment variable.
[AUDIT ] CWWKF0012I: The server installed the following features: [el-3.0, jsp-2.3, servlet-4.0, springBoot-1.5, ssl-1.0, transportSecurity-1.0, websocket-1.1].
[AUDIT ] CWWKF0011I: The defaultServer server is ready to run a smarter planet. The defaultServer server started in 3.632 seconds.
[AUDIT ] CWPKI0803A: SSL certificate created in 2.124 seconds. SSL key file: /opt/ol/wlp/output/defaultServer/resources/security/key.p12
failed
$ bashbrew build open-liberty:springBoot1-java8-ibmsfj
Using bashbrew/cache:121ae6bf15f6c10fb70323fabdd82db82f2e5944820ef00d3f700088b5d3380d (open-liberty:springBoot1-java8-ibmsfj)
Tagging open-liberty:springBoot1-java8-ibmsfj
$ test/run.sh open-liberty:springBoot1-java8-ibmsfj
testing open-liberty:springBoot1-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
The following images failed at least one test:
|
naumanna
force-pushed
the
open-liberty-19005
branch
from
1debcee to
060a321
Compare
|
@yosifkit the tests were relying on wget being in our image and it was removed recently for security reasons. I updated the test to use a different client image with wget so that it is passing now. |
Diff:diff --git a/open-liberty_javaee7-java8-ibm/Dockerfile b/open-liberty_javaee7-java8-ibm/Dockerfile
index abd3d76..06020a0 100644
--- a/open-liberty_javaee7-java8-ibm/Dockerfile
+++ b/open-liberty_javaee7-java8-ibm/Dockerfile
@@ -2,5 +2,3 @@ FROM open-liberty:kernel-java8-ibm
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_javaee7-java8-ibmsfj/Dockerfile b/open-liberty_javaee7-java8-ibmsfj/Dockerfile
index 8138efc..32985a5 100644
--- a/open-liberty_javaee7-java8-ibmsfj/Dockerfile
+++ b/open-liberty_javaee7-java8-ibmsfj/Dockerfile
@@ -2,5 +2,3 @@ FROM open-liberty:kernel-java8-ibmsfj
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_javaee8-java8-ibmsfj/Dockerfile b/open-liberty_javaee8-java8-ibmsfj/Dockerfile
index 9dc68db..55632fe 100644
--- a/open-liberty_javaee8-java8-ibmsfj/Dockerfile
+++ b/open-liberty_javaee8-java8-ibmsfj/Dockerfile
@@ -1,15 +1,20 @@
FROM ibmjava:8-sfj-alpine
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=657ddda1fc6013ba14dfda51e28834d7ca4a78fe
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=180a2499f42f7469df06bbe39e27a5b0268113f8
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-javaee8/$LIBERTY_VERSION/openliberty-javaee8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
-RUN apk add --no-cache wget \
+RUN apk add --no-cache wget openssl \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
&& sha1sum -c /tmp/wlp.zip.sha1 \
@@ -18,7 +23,8 @@ RUN apk add --no-cache wget \
&& rm /tmp/wlp.zip.sha1 \
&& adduser -u 1001 -S -G root -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
- && chmod -R g+rw /opt/ol/wlp
+ && chmod -R g+rw /opt/ol/wlp \
+ && apk del --no-cache wget unzip
# Set Path Shortcuts
ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \
@@ -55,8 +61,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh b/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh
index 9ce84cb..721d43b 100755
--- a/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh
+++ b/open-liberty_javaee8-java8-ibmsfj/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_kernel-java8-ibm/Dockerfile b/open-liberty_kernel-java8-ibm/Dockerfile
index b852e52..819032e 100644
--- a/open-liberty_kernel-java8-ibm/Dockerfile
+++ b/open-liberty_kernel-java8-ibm/Dockerfile
@@ -1,15 +1,20 @@
FROM ibmjava:8-jre
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=d4a9be40d4e1e6e859b836f68379636eb2c19c6d
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=ee0fdbc716e9431b73d483555f0e267f007f0286
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
RUN apt-get update \
- && apt-get install -y --no-install-recommends unzip \
+ && apt-get install -y --no-install-recommends unzip openssl \
&& rm -rf /var/lib/apt/lists/* \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
@@ -18,6 +23,7 @@ RUN apt-get update \
&& rm /tmp/wlp.zip \
&& rm /tmp/wlp.zip.sha1 \
&& apt-get remove -y unzip \
+ && apt-get remove -y wget \
&& rm -rf /var/lib/apt/lists/* \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
diff --git a/open-liberty_kernel-java8-ibm/helpers/build/configure.sh b/open-liberty_kernel-java8-ibm/helpers/build/configure.sh
index 4a5cf96..29e2565 100755
--- a/open-liberty_kernel-java8-ibm/helpers/build/configure.sh
+++ b/open-liberty_kernel-java8-ibm/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_kernel-java8-ibmsfj/Dockerfile b/open-liberty_kernel-java8-ibmsfj/Dockerfile
index 73f1be2..790e866 100644
--- a/open-liberty_kernel-java8-ibmsfj/Dockerfile
+++ b/open-liberty_kernel-java8-ibmsfj/Dockerfile
@@ -1,14 +1,19 @@
FROM ibmjava:8-sfj-alpine
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=d4a9be40d4e1e6e859b836f68379636eb2c19c6d
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=ee0fdbc716e9431b73d483555f0e267f007f0286
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
-RUN apk add --no-cache wget \
+RUN apk add --no-cache wget openssl \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
&& sha1sum -c /tmp/wlp.zip.sha1 \
@@ -17,7 +22,8 @@ RUN apk add --no-cache wget \
&& rm /tmp/wlp.zip.sha1 \
&& adduser -u 1001 -S -G root -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
- && chmod -R g+rw /opt/ol/wlp
+ && chmod -R g+rw /opt/ol/wlp \
+ && apk del --no-cache wget unzip
# Set Path Shortcuts
ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \
@@ -58,7 +64,7 @@ RUN mkdir /logs \
#These settings are needed so that we can run as a different user than 1001 after server warmup
ENV RANDFILE=/tmp/.rnd \
- JVM_ARGS="-Xshareclasses:name=liberty,nonfatal,cacheDir=/output/.classCache/ ${IBM_JAVA_OPTIONS}"
+ IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,nonfatal,cacheDir=/output/.classCache/ ${IBM_JAVA_OPTIONS}"
USER 1001
diff --git a/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh b/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh
index 9ce84cb..721d43b 100755
--- a/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh
+++ b/open-liberty_kernel-java8-ibmsfj/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_latest/Dockerfile b/open-liberty_latest/Dockerfile
index 1625d8c..67dbf39 100644
--- a/open-liberty_latest/Dockerfile
+++ b/open-liberty_latest/Dockerfile
@@ -1,16 +1,21 @@
FROM ibmjava:8-jre
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=657ddda1fc6013ba14dfda51e28834d7ca4a78fe
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=180a2499f42f7469df06bbe39e27a5b0268113f8
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-javaee8/$LIBERTY_VERSION/openliberty-javaee8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
RUN apt-get update \
- && apt-get install -y --no-install-recommends unzip \
+ && apt-get install -y --no-install-recommends unzip openssl \
&& rm -rf /var/lib/apt/lists/* \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
@@ -19,6 +24,7 @@ RUN apt-get update \
&& rm /tmp/wlp.zip \
&& rm /tmp/wlp.zip.sha1 \
&& apt-get remove -y unzip \
+ && apt-get remove -y wget \
&& rm -rf /var/lib/apt/lists/* \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
@@ -60,8 +66,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_latest/helpers/build/configure.sh b/open-liberty_latest/helpers/build/configure.sh
index 4a5cf96..29e2565 100755
--- a/open-liberty_latest/helpers/build/configure.sh
+++ b/open-liberty_latest/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile1-java8-ibm/Dockerfile b/open-liberty_microProfile1-java8-ibm/Dockerfile
index 596450c..424e800 100644
--- a/open-liberty_microProfile1-java8-ibm/Dockerfile
+++ b/open-liberty_microProfile1-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile1-java8-ibmsfj/Dockerfile b/open-liberty_microProfile1-java8-ibmsfj/Dockerfile
index 48ec89c..bb4f570 100644
--- a/open-liberty_microProfile1-java8-ibmsfj/Dockerfile
+++ b/open-liberty_microProfile1-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile2-java8-ibm/Dockerfile b/open-liberty_microProfile2-java8-ibm/Dockerfile
index 4a9baa5..cea4447 100644
--- a/open-liberty_microProfile2-java8-ibm/Dockerfile
+++ b/open-liberty_microProfile2-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_microProfile2-java8-ibmsfj/Dockerfile b/open-liberty_microProfile2-java8-ibmsfj/Dockerfile
index a866a65..c205eb2 100644
--- a/open-liberty_microProfile2-java8-ibmsfj/Dockerfile
+++ b/open-liberty_microProfile2-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot1-java8-ibm/Dockerfile b/open-liberty_springBoot1-java8-ibm/Dockerfile
index 7492a17..711565a 100644
--- a/open-liberty_springBoot1-java8-ibm/Dockerfile
+++ b/open-liberty_springBoot1-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibm
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot1-java8-ibmsfj/Dockerfile b/open-liberty_springBoot1-java8-ibmsfj/Dockerfile
index 3e368a8..6cd8efc 100644
--- a/open-liberty_springBoot1-java8-ibmsfj/Dockerfile
+++ b/open-liberty_springBoot1-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibmsfj
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot2-java8-ibm/Dockerfile b/open-liberty_springBoot2-java8-ibm/Dockerfile
index 2ef8eaf..bc99462 100644
--- a/open-liberty_springBoot2-java8-ibm/Dockerfile
+++ b/open-liberty_springBoot2-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibm
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_springBoot2-java8-ibmsfj/Dockerfile b/open-liberty_springBoot2-java8-ibmsfj/Dockerfile
index 271e77d..f131ec6 100644
--- a/open-liberty_springBoot2-java8-ibmsfj/Dockerfile
+++ b/open-liberty_springBoot2-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
FROM open-liberty:kernel-java8-ibmsfj
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile7-java8-ibm/Dockerfile b/open-liberty_webProfile7-java8-ibm/Dockerfile
index 646dca2..0678bf1 100644
--- a/open-liberty_webProfile7-java8-ibm/Dockerfile
+++ b/open-liberty_webProfile7-java8-ibm/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile7-java8-ibmsfj/Dockerfile b/open-liberty_webProfile7-java8-ibmsfj/Dockerfile
index cf255c8..da62002 100644
--- a/open-liberty_webProfile7-java8-ibmsfj/Dockerfile
+++ b/open-liberty_webProfile7-java8-ibmsfj/Dockerfile
@@ -1,5 +1,3 @@
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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile8-java8-ibm/Dockerfile b/open-liberty_webProfile8-java8-ibm/Dockerfile
index f94b763..8c4e5da 100644
--- a/open-liberty_webProfile8-java8-ibm/Dockerfile
+++ b/open-liberty_webProfile8-java8-ibm/Dockerfile
@@ -1,16 +1,21 @@
FROM ibmjava:8-jre
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=64c39d499297823ff2b56f8a7108b57da3a13fc4
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=d0b7dfe4f5f2f4c7b6280081c123aab3fc90fdcc
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-webProfile8/$LIBERTY_VERSION/openliberty-webProfile8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
RUN apt-get update \
- && apt-get install -y --no-install-recommends unzip \
+ && apt-get install -y --no-install-recommends unzip openssl \
&& rm -rf /var/lib/apt/lists/* \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
@@ -19,6 +24,7 @@ RUN apt-get update \
&& rm /tmp/wlp.zip \
&& rm /tmp/wlp.zip.sha1 \
&& apt-get remove -y unzip \
+ && apt-get remove -y wget \
&& rm -rf /var/lib/apt/lists/* \
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
@@ -59,8 +65,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh b/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh
index 4a5cf96..29e2565 100755
--- a/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh
+++ b/open-liberty_webProfile8-java8-ibm/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
diff --git a/open-liberty_webProfile8-java8-ibmsfj/Dockerfile b/open-liberty_webProfile8-java8-ibmsfj/Dockerfile
index e6941f0..46b4837 100644
--- a/open-liberty_webProfile8-java8-ibmsfj/Dockerfile
+++ b/open-liberty_webProfile8-java8-ibmsfj/Dockerfile
@@ -1,15 +1,20 @@
FROM ibmjava:8-sfj-alpine
-ARG LIBERTY_VERSION=19.0.0.4
-ARG LIBERTY_SHA=64c39d499297823ff2b56f8a7108b57da3a13fc4
+ARG LIBERTY_VERSION=19.0.0.5
+ARG LIBERTY_SHA=d0b7dfe4f5f2f4c7b6280081c123aab3fc90fdcc
+ARG LIBERTY_BUILD_LABEL=cl190520190522-2227
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-webProfile8/$LIBERTY_VERSION/openliberty-webProfile8-$LIBERTY_VERSION.zip
-LABEL maintainer="Arthur De Magalhaes" vendor="Open Liberty" url="https://openliberty.io/" github="https://github.com/OpenLiberty/ci.docker"
+LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Andy Naumann" \
+ org.opencontainers.image.vendor="Open Liberty" \
+ org.opencontainers.image.url="https://openliberty.io/" \
+ org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL"
COPY helpers /opt/ol/helpers
# Install Open Liberty
-RUN apk add --no-cache wget \
+RUN apk add --no-cache wget openssl \
&& wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
&& sha1sum -c /tmp/wlp.zip.sha1 \
@@ -18,7 +23,8 @@ RUN apk add --no-cache wget \
&& rm /tmp/wlp.zip.sha1 \
&& adduser -u 1001 -S -G root -s /usr/sbin/nologin default \
&& chown -R 1001:0 /opt/ol/wlp \
- && chmod -R g+rw /opt/ol/wlp
+ && chmod -R g+rw /opt/ol/wlp \
+ && apk del --no-cache wget unzip
# Set Path Shortcuts
ENV PATH=/opt/ol/wlp/bin:/opt/ol/docker/:/opt/ol/helpers/build:$PATH \
@@ -55,8 +61,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
- && 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/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+ && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
USER 1001
diff --git a/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh b/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh
index 9ce84cb..721d43b 100755
--- a/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh
+++ b/open-liberty_webProfile8-java8-ibmsfj/helpers/build/configure.sh
@@ -62,3 +62,5 @@ if [ "$JMS_ENDPOINT" == "true" ]; then
cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
fi
fi
+# Server start/stop to populate the /output/workarea and make subsequent server starts faster
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/* |
tianon
reviewed
May 29, 2019
| # since we have curl in the liberty image, we'll use that | ||
| clientImage="$1" | ||
| # Use the alpine image since it is small and has wget in it that we can use | ||
| clientImage="alpine:latest" |
There was a problem hiding this comment.
I'd recommend updating this to a specific version (like alpine:3.9), but that can be a separate PR (I'll have a build test in a second). 👍
|
LGTM Build test of #5950; 060a321; $ bashbrew build open-liberty:kernel
Using bashbrew/cache:f85d45f2c7b71311acd6e7648e7bfd9fd225e65a3a3ec6d00e5aaf51bdd6bb4b (open-liberty:kernel)
Tagging open-liberty:kernel
Tagging open-liberty:kernel-java8-ibm
$ test/run.sh open-liberty:kernel
testing open-liberty:kernel
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:kernel-java8-ibmsfj
Using bashbrew/cache:91533933e990628077ac98e4add6fb505fbe2db59adaf842300bd4afe0f0acde (open-liberty:kernel-java8-ibmsfj)
Tagging open-liberty:kernel-java8-ibmsfj
$ test/run.sh open-liberty:kernel-java8-ibmsfj
testing open-liberty:kernel-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:webProfile8
Using bashbrew/cache:76b571b0d61049b1c15b019ba270a342bdd194ca28ad14829e6a8afbe8bfd464 (open-liberty:webProfile8)
Tagging open-liberty:webProfile8
Tagging open-liberty:webProfile8-java8-ibm
$ test/run.sh open-liberty:webProfile8
testing open-liberty:webProfile8
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:webProfile8-java8-ibmsfj
Using bashbrew/cache:062e3546a01be8fb85da1dcc1031ff02309df89b9cd47e0eeb3e1bd573a66561 (open-liberty:webProfile8-java8-ibmsfj)
Tagging open-liberty:webProfile8-java8-ibmsfj
$ test/run.sh open-liberty:webProfile8-java8-ibmsfj
testing open-liberty:webProfile8-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]......passed
$ bashbrew build open-liberty:javaee8
Using bashbrew/cache:eb9062ad3d2e70bfa909f86148b5e49ed7f9fb9bd5fbd10a20babe6011401779 (open-liberty:javaee8)
Tagging open-liberty:javaee8
Tagging open-liberty:javaee8-java8-ibm
Tagging open-liberty:latest
$ test/run.sh open-liberty:javaee8
testing open-liberty:javaee8
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]......passed
$ bashbrew build open-liberty:javaee8-java8-ibmsfj
Using bashbrew/cache:ede87a82728fbdbe562b2f8b09ec07cb1a4b4ad5e378308b3aa78b88d2d9eff9 (open-liberty:javaee8-java8-ibmsfj)
Tagging open-liberty:javaee8-java8-ibmsfj
$ test/run.sh open-liberty:javaee8-java8-ibmsfj
testing open-liberty:javaee8-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]......passed
$ bashbrew build open-liberty:microProfile1
Using bashbrew/cache:853d4e51c00e540f27b7a320ac8ba1f2d69b3714c3bd90c37f561c21f96a9a78 (open-liberty:microProfile1)
Tagging open-liberty:microProfile1
Tagging open-liberty:microProfile1-java8-ibm
$ test/run.sh open-liberty:microProfile1
testing open-liberty:microProfile1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:microProfile1-java8-ibmsfj
Using bashbrew/cache:5384ca29ac9dec2054e4bc49922746ed79a411b349d4d3e3f4b18bc567eeaf1b (open-liberty:microProfile1-java8-ibmsfj)
Tagging open-liberty:microProfile1-java8-ibmsfj
$ test/run.sh open-liberty:microProfile1-java8-ibmsfj
testing open-liberty:microProfile1-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:microProfile2
Using bashbrew/cache:43df2336c66a93659e6b9a3ae6f280c705deb279d082a234f5324ffd25622003 (open-liberty:microProfile2)
Tagging open-liberty:microProfile2
Tagging open-liberty:microProfile2-java8-ibm
$ test/run.sh open-liberty:microProfile2
testing open-liberty:microProfile2
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]......passed
$ bashbrew build open-liberty:microProfile2-java8-ibmsfj
Using bashbrew/cache:566b2f10b84bb62222cacc3363baef904d4acac0405f66120bd19e3b38aa937b (open-liberty:microProfile2-java8-ibmsfj)
Tagging open-liberty:microProfile2-java8-ibmsfj
$ test/run.sh open-liberty:microProfile2-java8-ibmsfj
testing open-liberty:microProfile2-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:springBoot2
Using bashbrew/cache:53e77558210822e9594792a57b91d149057ef3c27f39fe480717ff1b455ca788 (open-liberty:springBoot2)
Tagging open-liberty:springBoot2
Tagging open-liberty:springBoot2-java8-ibm
$ test/run.sh open-liberty:springBoot2
testing open-liberty:springBoot2
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]....passed
$ bashbrew build open-liberty:springBoot2-java8-ibmsfj
Using bashbrew/cache:604fcf51e7084f8f7617790a90c6eb9d07c1c0b60020bdea3d94990c700ff48d (open-liberty:springBoot2-java8-ibmsfj)
Tagging open-liberty:springBoot2-java8-ibmsfj
$ test/run.sh open-liberty:springBoot2-java8-ibmsfj
testing open-liberty:springBoot2-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:webProfile7
Using bashbrew/cache:ff06881ec8f2eb7c59dd3c3c0d68e9bbe704f4b9dc70182284d7e20077456c72 (open-liberty:webProfile7)
Tagging open-liberty:webProfile7
Tagging open-liberty:webProfile7-java8-ibm
$ test/run.sh open-liberty:webProfile7
testing open-liberty:webProfile7
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:webProfile7-java8-ibmsfj
Using bashbrew/cache:04b87d9a994fea2ee33a20a925321c414791a6c5aedb09a4a7443c7958655840 (open-liberty:webProfile7-java8-ibmsfj)
Tagging open-liberty:webProfile7-java8-ibmsfj
$ test/run.sh open-liberty:webProfile7-java8-ibmsfj
testing open-liberty:webProfile7-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]......passed
$ bashbrew build open-liberty:javaee7
Using bashbrew/cache:645e224c976d107b0147928a67117ee0c1cd2c115632f8ad5a33ef7a9fb9cab7 (open-liberty:javaee7)
Tagging open-liberty:javaee7
Tagging open-liberty:javaee7-java8-ibm
$ test/run.sh open-liberty:javaee7
testing open-liberty:javaee7
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5]......passed
$ bashbrew build open-liberty:javaee7-java8-ibmsfj
Using bashbrew/cache:011899a00cefd3e0cb2291926378463b8553c15d7a91fbd49bd9562cf8acf9f8 (open-liberty:javaee7-java8-ibmsfj)
Tagging open-liberty:javaee7-java8-ibmsfj
$ test/run.sh open-liberty:javaee7-java8-ibmsfj
testing open-liberty:javaee7-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].......passed
$ bashbrew build open-liberty:springBoot1
Using bashbrew/cache:0b53d310bf922496948921e96aa42092cfc6c93286ffe3b6a3d4a5a92e521dc6 (open-liberty:springBoot1)
Tagging open-liberty:springBoot1
Tagging open-liberty:springBoot1-java8-ibm
$ test/run.sh open-liberty:springBoot1
testing open-liberty:springBoot1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
$ bashbrew build open-liberty:springBoot1-java8-ibmsfj
Using bashbrew/cache:121ae6bf15f6c10fb70323fabdd82db82f2e5944820ef00d3f700088b5d3380d (open-liberty:springBoot1-java8-ibmsfj)
Tagging open-liberty:springBoot1-java8-ibmsfj
$ test/run.sh open-liberty:springBoot1-java8-ibmsfj
testing open-liberty:springBoot1-java8-ibmsfj
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'open-liberty-hello-world' [5/5].....passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updating to newly released version 19.0.0.5.