From 32abbec97c766e7cf02233dd1cb9706fda2a1eb2 Mon Sep 17 00:00:00 2001 From: Royi Freifeld Date: Sun, 3 Sep 2017 20:50:54 +0300 Subject: [PATCH 1/9] updated payara micro version --- payara-micro/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payara-micro/Dockerfile b/payara-micro/Dockerfile index 1f132e4..6ac1f56 100644 --- a/payara-micro/Dockerfile +++ b/payara-micro/Dockerfile @@ -2,9 +2,9 @@ FROM airhacks/java MAINTAINER Adam Bien, adam-bien.com ENV PAYARA_ARCHIVE payaramicro41 ENV INSTALL_DIR /opt -RUN curl -o ${INSTALL_DIR}/${PAYARA_ARCHIVE}.jar -L "http://info.payara.fish/cs/c/?cta_guid=21e00628-5d9e-400a-9805-1fc99fe0de87&placement_guid=0c1037e0-adaf-4401-b888-05088602db6a&portal_id=334594&redirect_url=APefjpFVsQB_htu3NVKna4zRjs_tCLoARwgBizSGCLsVswTfkZOF31FUJjd72xy37zAEH_s6iGa44DKv_MGBdW13uPEDWWEbDt9E8smFH24YTNNbBsGIGWM" +RUN curl -o ${INSTALL_DIR}/${PAYARA_ARCHIVE}.jar -L "http://info.payara.fish/cs/c/?cta_guid=21e00628-5d9e-400a-9805-1fc99fe0de87&placement_guid=0c1037e0-adaf-4401-b888-05088602db6a&portal_id=334594&redirect_url=APefjpFYtlu7oDOGMZCTGTtyN9vt-K32kh_MQdfXXhYy48juhgnXbDukWKhjnsSVuRdDn7T3JlH9_paATnuqajHYpCUW7caiUILJUTesVUX-BQRmPBmp3H1IyZmjiJVIOXUAVFEZU73jg2ZwnpActVxo5AWuca4Vpw7ZVJyYB62wsCdFLv8WUKP7X3sqSNRCVWkLiuFNXKjLzLViNqtI94nZrIXAVFCyeXW6J-egrG_WR-8crHV3Ol-_FS_AYabIse7yxDLsb2rh&hsutk=8ccfb50520c503176f25e315912e81a1" ENV PAYARA_HOME ${INSTALL_DIR} ENV DEPLOYMENT_DIR ${PAYARA_HOME} ENTRYPOINT java -jar ${PAYARA_ARCHIVE}.jar --deploy ${ARCHIVE_NAME} WORKDIR ${INSTALL_DIR} -EXPOSE 8080 5900 \ No newline at end of file +EXPOSE 8080 5900 From 7a6b9a34da68ff6575017c6f3d46a30a2a2c77ba Mon Sep 17 00:00:00 2001 From: Royi Freifeld Date: Sat, 7 Jul 2018 16:40:09 +0300 Subject: [PATCH 2/9] Updated openliberty stable release version --- openliberty-kernel/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openliberty-kernel/Dockerfile b/openliberty-kernel/Dockerfile index 8d53f2b..c12d459 100644 --- a/openliberty-kernel/Dockerfile +++ b/openliberty-kernel/Dockerfile @@ -1,7 +1,7 @@ FROM airhacks/java LABEL maintainer="Tobias N. Sasse, @tnsasse and Adam Bien, adam-bien.com" description="OpenLiberty Kernel" -ENV RELEASE 2017-09-27_1951 -ENV VERSION 17.0.0.3 +ENV RELEASE 2018-06-19_0502 +ENV VERSION 18.0.0.2 ENV INSTALL_DIR /opt/ibm # Download OpenLiberty From 43f744e2211f5b69dc4ae51a57ba9050618ac629 Mon Sep 17 00:00:00 2001 From: Royi Freifeld Date: Sat, 7 Jul 2018 17:08:41 +0300 Subject: [PATCH 3/9] fixed openliberty to be like the dev version... For some reason docker-server was set there... --- openliberty-kernel/Dockerfile | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/openliberty-kernel/Dockerfile b/openliberty-kernel/Dockerfile index c12d459..205cecf 100644 --- a/openliberty-kernel/Dockerfile +++ b/openliberty-kernel/Dockerfile @@ -2,7 +2,7 @@ FROM airhacks/java LABEL maintainer="Tobias N. Sasse, @tnsasse and Adam Bien, adam-bien.com" description="OpenLiberty Kernel" ENV RELEASE 2018-06-19_0502 ENV VERSION 18.0.0.2 -ENV INSTALL_DIR /opt/ibm +ENV INSTALL_DIR /opt/ # Download OpenLiberty ENV OPENLIBERTY_HOME ${INSTALL_DIR}/openliberty-${VERSION} @@ -10,22 +10,6 @@ ENV DEPLOYMENT_DIR ${OPENLIBERTY_HOME}/standalone/deployments/ RUN curl -O https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/release/${RELEASE}/openliberty-${VERSION}.zip \ && unzip openliberty-${VERSION}.zip -d ${INSTALL_DIR} \ && rm openliberty-${VERSION}.zip -ENV PATH=/opt/ibm/wlp/bin:$PATH - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output - -RUN mkdir /logs \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea -COPY docker-server /opt/ibm/docker/ -RUN chmod a+x /opt/ibm/docker/docker-server - +ENV CONFIG /opt/wlp/usr/servers/defaultServer/ EXPOSE 9080 9443 - -CMD ["/opt/ibm/docker/docker-server", "run", "defaultServer"] +ENTRYPOINT /opt/wlp/bin/server run defaultServer From cead183d64e3154f000614fb75f838916da2b210 Mon Sep 17 00:00:00 2001 From: Royi Freifeld Date: Sat, 7 Jul 2018 17:08:41 +0300 Subject: [PATCH 4/9] Revert "fixed openliberty to be like the dev version... For some reason docker-server was set there..." This reverts commit 43f744e2211f5b69dc4ae51a57ba9050618ac629. --- openliberty-kernel/Dockerfile | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/openliberty-kernel/Dockerfile b/openliberty-kernel/Dockerfile index 205cecf..c12d459 100644 --- a/openliberty-kernel/Dockerfile +++ b/openliberty-kernel/Dockerfile @@ -2,7 +2,7 @@ FROM airhacks/java LABEL maintainer="Tobias N. Sasse, @tnsasse and Adam Bien, adam-bien.com" description="OpenLiberty Kernel" ENV RELEASE 2018-06-19_0502 ENV VERSION 18.0.0.2 -ENV INSTALL_DIR /opt/ +ENV INSTALL_DIR /opt/ibm # Download OpenLiberty ENV OPENLIBERTY_HOME ${INSTALL_DIR}/openliberty-${VERSION} @@ -10,6 +10,22 @@ ENV DEPLOYMENT_DIR ${OPENLIBERTY_HOME}/standalone/deployments/ RUN curl -O https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/release/${RELEASE}/openliberty-${VERSION}.zip \ && unzip openliberty-${VERSION}.zip -d ${INSTALL_DIR} \ && rm openliberty-${VERSION}.zip -ENV CONFIG /opt/wlp/usr/servers/defaultServer/ +ENV PATH=/opt/ibm/wlp/bin:$PATH + +# Set Path Shortcuts +ENV LOG_DIR=/logs \ + WLP_OUTPUT_DIR=/opt/ibm/wlp/output + +RUN mkdir /logs \ + && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ + && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config + +# Configure WebSphere Liberty +RUN /opt/ibm/wlp/bin/server create \ + && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea +COPY docker-server /opt/ibm/docker/ +RUN chmod a+x /opt/ibm/docker/docker-server + EXPOSE 9080 9443 -ENTRYPOINT /opt/wlp/bin/server run defaultServer + +CMD ["/opt/ibm/docker/docker-server", "run", "defaultServer"] From b556bd84abf0d3877a36529637eb006a8d757043 Mon Sep 17 00:00:00 2001 From: Royi Freifeld Date: Sat, 7 Jul 2018 16:40:09 +0300 Subject: [PATCH 5/9] Revert "Updated openliberty stable release version" This reverts commit 7a6b9a34da68ff6575017c6f3d46a30a2a2c77ba. --- openliberty-kernel/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openliberty-kernel/Dockerfile b/openliberty-kernel/Dockerfile index c12d459..8d53f2b 100644 --- a/openliberty-kernel/Dockerfile +++ b/openliberty-kernel/Dockerfile @@ -1,7 +1,7 @@ FROM airhacks/java LABEL maintainer="Tobias N. Sasse, @tnsasse and Adam Bien, adam-bien.com" description="OpenLiberty Kernel" -ENV RELEASE 2018-06-19_0502 -ENV VERSION 18.0.0.2 +ENV RELEASE 2017-09-27_1951 +ENV VERSION 17.0.0.3 ENV INSTALL_DIR /opt/ibm # Download OpenLiberty From 148b8943a9721283bc8edc82835a08054cbcf82e Mon Sep 17 00:00:00 2001 From: Royi Freifeld Date: Sat, 7 Jul 2018 20:52:19 +0300 Subject: [PATCH 6/9] Updated openliberty stable vesion --- openliberty-kernel/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openliberty-kernel/Dockerfile b/openliberty-kernel/Dockerfile index 8d53f2b..c12d459 100644 --- a/openliberty-kernel/Dockerfile +++ b/openliberty-kernel/Dockerfile @@ -1,7 +1,7 @@ FROM airhacks/java LABEL maintainer="Tobias N. Sasse, @tnsasse and Adam Bien, adam-bien.com" description="OpenLiberty Kernel" -ENV RELEASE 2017-09-27_1951 -ENV VERSION 17.0.0.3 +ENV RELEASE 2018-06-19_0502 +ENV VERSION 18.0.0.2 ENV INSTALL_DIR /opt/ibm # Download OpenLiberty From 8f022f4df6ab88dbc5b9ecdd5a06993d607fb046 Mon Sep 17 00:00:00 2001 From: Royi Freifeld Date: Sat, 7 Jul 2018 22:27:23 +0300 Subject: [PATCH 7/9] update to a newer version of openliberty-dev --- openliberty-kernel-dev/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openliberty-kernel-dev/Dockerfile b/openliberty-kernel-dev/Dockerfile index 2890db7..6e44727 100644 --- a/openliberty-kernel-dev/Dockerfile +++ b/openliberty-kernel-dev/Dockerfile @@ -1,13 +1,13 @@ FROM airhacks/java LABEL maintainer="Adam Bien, adam-bien.com" description="OpenLiberty Kernel Development Builds" -ENV RELEASE 2017-12-10_0757 -ENV VERSION 17.0.0.4-201712100749 +ENV RELEASE 2018-07-07_1412 +ENV VERSION 20180707-1300 ENV INSTALL_DIR /opt/ # Download OpenLiberty ENV OPENLIBERTY_HOME ${INSTALL_DIR}/openliberty-${VERSION} ENV DEPLOYMENT_DIR ${OPENLIBERTY_HOME}/standalone/deployments/ -RUN curl -O https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly//${RELEASE}/openliberty-all-${VERSION}.zip \ +RUN curl -O https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/${RELEASE}/openliberty-all-${VERSION}.zip \ && unzip openliberty-all-${VERSION}.zip -d ${INSTALL_DIR} \ && rm openliberty-all-${VERSION}.zip ENV CONFIG /opt/wlp/usr/servers/defaultServer/ From 8a3a7ee9dc296424dda638fad1939458c664a4b8 Mon Sep 17 00:00:00 2001 From: Royi Freifeld Date: Sun, 8 Jul 2018 20:55:59 +0300 Subject: [PATCH 8/9] Openliberty-kernel-dev now works --- openliberty-kernel-dev/Dockerfile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/openliberty-kernel-dev/Dockerfile b/openliberty-kernel-dev/Dockerfile index 6e44727..4150473 100644 --- a/openliberty-kernel-dev/Dockerfile +++ b/openliberty-kernel-dev/Dockerfile @@ -2,17 +2,15 @@ FROM airhacks/java LABEL maintainer="Adam Bien, adam-bien.com" description="OpenLiberty Kernel Development Builds" ENV RELEASE 2018-07-07_1412 ENV VERSION 20180707-1300 -ENV INSTALL_DIR /opt/ +ENV INSTALL_DIR /opt # Download OpenLiberty -ENV OPENLIBERTY_HOME ${INSTALL_DIR}/openliberty-${VERSION} -ENV DEPLOYMENT_DIR ${OPENLIBERTY_HOME}/standalone/deployments/ -RUN curl -O https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/${RELEASE}/openliberty-all-${VERSION}.zip \ - && unzip openliberty-all-${VERSION}.zip -d ${INSTALL_DIR} \ +ADD https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/${RELEASE}/openliberty-all-${VERSION}.zip . +RUN unzip openliberty-all-${VERSION}.zip -d ${INSTALL_DIR} \ && rm openliberty-all-${VERSION}.zip -ENV CONFIG /opt/wlp/usr/servers/defaultServer/ + +ENV OPENLIBERTY_HOME ${INSTALL_DIR}/wlp/usr/servers/defaultServer +ENV CONFIG ${OPENLIBERTY_HOME} +ENV DEPLOYMENT_DIR ${OPENLIBERTY_HOME}/dropins EXPOSE 9080 9443 ENTRYPOINT /opt/wlp/bin/server run defaultServer - - - From 2e43e582ecde5d0395ff821c3a03598e2b171180 Mon Sep 17 00:00:00 2001 From: Royi Freifeld Date: Sat, 14 Jul 2018 14:39:51 +0300 Subject: [PATCH 9/9] payara-micro updated to v5 --- payara-micro/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payara-micro/Dockerfile b/payara-micro/Dockerfile index 6ac1f56..8fd8d83 100644 --- a/payara-micro/Dockerfile +++ b/payara-micro/Dockerfile @@ -1,10 +1,10 @@ FROM airhacks/java MAINTAINER Adam Bien, adam-bien.com -ENV PAYARA_ARCHIVE payaramicro41 +ENV PAYARA_ARCHIVE payara-micro-5.182 ENV INSTALL_DIR /opt -RUN curl -o ${INSTALL_DIR}/${PAYARA_ARCHIVE}.jar -L "http://info.payara.fish/cs/c/?cta_guid=21e00628-5d9e-400a-9805-1fc99fe0de87&placement_guid=0c1037e0-adaf-4401-b888-05088602db6a&portal_id=334594&redirect_url=APefjpFYtlu7oDOGMZCTGTtyN9vt-K32kh_MQdfXXhYy48juhgnXbDukWKhjnsSVuRdDn7T3JlH9_paATnuqajHYpCUW7caiUILJUTesVUX-BQRmPBmp3H1IyZmjiJVIOXUAVFEZU73jg2ZwnpActVxo5AWuca4Vpw7ZVJyYB62wsCdFLv8WUKP7X3sqSNRCVWkLiuFNXKjLzLViNqtI94nZrIXAVFCyeXW6J-egrG_WR-8crHV3Ol-_FS_AYabIse7yxDLsb2rh&hsutk=8ccfb50520c503176f25e315912e81a1" ENV PAYARA_HOME ${INSTALL_DIR} ENV DEPLOYMENT_DIR ${PAYARA_HOME} +ADD "https://cms2.hubspot.com/ctas/v2/public/cs/c/?cta_guid=21e00628-5d9e-400a-9805-1fc99fe0de87&placement_guid=0c1037e0-adaf-4401-b888-05088602db6a" ${INSTALL_DIR}/${PAYARA_ARCHIVE}.jar ENTRYPOINT java -jar ${PAYARA_ARCHIVE}.jar --deploy ${ARCHIVE_NAME} WORKDIR ${INSTALL_DIR} EXPOSE 8080 5900