[1/3] geode git commit: GEODE-3423: Provide support for running parallel docker builds in Jenkins
Repository: geode Updated Branches: refs/heads/develop 52ae15094 -> c1129c7ab GEODE-3423: Provide support for running parallel docker builds in Jenkins - Also cleaning up other Dockerfiles which are unused Signed-off-by: Scott JewellProject: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b20b4930 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b20b4930 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b20b4930 Branch: refs/heads/develop Commit: b20b49308808aed9c8c8fdde1226649956ba9e0b Parents: acdf2e8 Author: Jens Deppe Authored: Thu Aug 10 10:22:17 2017 -0700 Committer: Scott Jewell Committed: Thu Aug 10 10:22:17 2017 -0700 -- dev-tools/docker/base/Dockerfile| 42 + dev-tools/docker/base/build-base-docker.sh | 4 +- dev-tools/docker/base/entrypoint.sh | 29 + dev-tools/docker/compile/Dockerfile | 21 --- .../docker/compile/start-compile-docker.sh | 62 gradle/docker.gradle| 12 ++-- 6 files changed, 52 insertions(+), 118 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/b20b4930/dev-tools/docker/base/Dockerfile -- diff --git a/dev-tools/docker/base/Dockerfile b/dev-tools/docker/base/Dockerfile index 1cce0dd..4ba74bc 100644 --- a/dev-tools/docker/base/Dockerfile +++ b/dev-tools/docker/base/Dockerfile @@ -21,34 +21,20 @@ LABEL Vendor="Apache Geode" LABEL version=unstable # download JDK 8 -ENVJAVA_HOME /jdk1.8.0_51 - -RUNyum install -y wget which tar git \ - && wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/8u51-b16/jdk-8u51-linux-x64.tar.gz; \ - && tar xf jdk-8u51-linux-x64.tar.gz \ - && rm -rf $JAVA_HOME/*src.zip \ - $JAVA_HOME/lib/missioncontrol \ - $JAVA_HOME/lib/visualvm \ - $JAVA_HOME/lib/*javafx* \ - $JAVA_HOME/jre/lib/plugin.jar \ - $JAVA_HOME/jre/lib/ext/jfxrt.jar \ - $JAVA_HOME/jre/bin/javaws \ - $JAVA_HOME/jre/lib/javaws.jar \ - $JAVA_HOME/jre/lib/desktop \ - $JAVA_HOME/jre/plugin \ - $JAVA_HOME/jre/lib/deploy* \ - $JAVA_HOME/jre/lib/*javafx* \ - $JAVA_HOME/jre/lib/*jfx* \ - $JAVA_HOME/jre/lib/amd64/libdecora_sse.so \ - $JAVA_HOME/jre/lib/amd64/libprism_*.so \ - $JAVA_HOME/jre/lib/amd64/libfxplugins.so \ - $JAVA_HOME/jre/lib/amd64/libglass.so \ - $JAVA_HOME/jre/lib/amd64/libgstreamer-lite.so \ - $JAVA_HOME/jre/lib/amd64/libjavafx*.so \ - $JAVA_HOME/jre/lib/amd64/libjfx*.so \ - jdk-8u51-linux-x64.tar.gz \ - /usr/share/locale/* \ - && yum clean all +ENV JAVA_HOME /jdk1.8.0_144 + +RUN yum install -y wget which tar git +RUN wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-8u144-linux-x64.tar.gz; +RUN tar xf jdk-8u144-linux-x64.tar.gz +RUN rm jdk-8u144-linux-x64.tar.gz +RUN yum clean all ENV PATH $PATH:$JAVA_HOME/bin +RUN curl -L -o /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64 +RUN chmod +x /usr/local/bin/gosu + +COPY entrypoint.sh /usr/local/bin/entrypoint.sh + +ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] + http://git-wip-us.apache.org/repos/asf/geode/blob/b20b4930/dev-tools/docker/base/build-base-docker.sh -- diff --git a/dev-tools/docker/base/build-base-docker.sh b/dev-tools/docker/base/build-base-docker.sh index 9aab72c..d2d17fc 100755 --- a/dev-tools/docker/base/build-base-docker.sh
geode git commit: GEODE-3423: Provide support for running parallel docker builds in Jenkins
Repository: geode Updated Branches: refs/heads/feature/GEODE-3423 [created] b20b49308 GEODE-3423: Provide support for running parallel docker builds in Jenkins - Also cleaning up other Dockerfiles which are unused Signed-off-by: Scott JewellProject: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b20b4930 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b20b4930 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b20b4930 Branch: refs/heads/feature/GEODE-3423 Commit: b20b49308808aed9c8c8fdde1226649956ba9e0b Parents: acdf2e8 Author: Jens Deppe Authored: Thu Aug 10 10:22:17 2017 -0700 Committer: Scott Jewell Committed: Thu Aug 10 10:22:17 2017 -0700 -- dev-tools/docker/base/Dockerfile| 42 + dev-tools/docker/base/build-base-docker.sh | 4 +- dev-tools/docker/base/entrypoint.sh | 29 + dev-tools/docker/compile/Dockerfile | 21 --- .../docker/compile/start-compile-docker.sh | 62 gradle/docker.gradle| 12 ++-- 6 files changed, 52 insertions(+), 118 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/b20b4930/dev-tools/docker/base/Dockerfile -- diff --git a/dev-tools/docker/base/Dockerfile b/dev-tools/docker/base/Dockerfile index 1cce0dd..4ba74bc 100644 --- a/dev-tools/docker/base/Dockerfile +++ b/dev-tools/docker/base/Dockerfile @@ -21,34 +21,20 @@ LABEL Vendor="Apache Geode" LABEL version=unstable # download JDK 8 -ENVJAVA_HOME /jdk1.8.0_51 - -RUNyum install -y wget which tar git \ - && wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/8u51-b16/jdk-8u51-linux-x64.tar.gz; \ - && tar xf jdk-8u51-linux-x64.tar.gz \ - && rm -rf $JAVA_HOME/*src.zip \ - $JAVA_HOME/lib/missioncontrol \ - $JAVA_HOME/lib/visualvm \ - $JAVA_HOME/lib/*javafx* \ - $JAVA_HOME/jre/lib/plugin.jar \ - $JAVA_HOME/jre/lib/ext/jfxrt.jar \ - $JAVA_HOME/jre/bin/javaws \ - $JAVA_HOME/jre/lib/javaws.jar \ - $JAVA_HOME/jre/lib/desktop \ - $JAVA_HOME/jre/plugin \ - $JAVA_HOME/jre/lib/deploy* \ - $JAVA_HOME/jre/lib/*javafx* \ - $JAVA_HOME/jre/lib/*jfx* \ - $JAVA_HOME/jre/lib/amd64/libdecora_sse.so \ - $JAVA_HOME/jre/lib/amd64/libprism_*.so \ - $JAVA_HOME/jre/lib/amd64/libfxplugins.so \ - $JAVA_HOME/jre/lib/amd64/libglass.so \ - $JAVA_HOME/jre/lib/amd64/libgstreamer-lite.so \ - $JAVA_HOME/jre/lib/amd64/libjavafx*.so \ - $JAVA_HOME/jre/lib/amd64/libjfx*.so \ - jdk-8u51-linux-x64.tar.gz \ - /usr/share/locale/* \ - && yum clean all +ENV JAVA_HOME /jdk1.8.0_144 + +RUN yum install -y wget which tar git +RUN wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-8u144-linux-x64.tar.gz; +RUN tar xf jdk-8u144-linux-x64.tar.gz +RUN rm jdk-8u144-linux-x64.tar.gz +RUN yum clean all ENV PATH $PATH:$JAVA_HOME/bin +RUN curl -L -o /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64 +RUN chmod +x /usr/local/bin/gosu + +COPY entrypoint.sh /usr/local/bin/entrypoint.sh + +ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] + http://git-wip-us.apache.org/repos/asf/geode/blob/b20b4930/dev-tools/docker/base/build-base-docker.sh -- diff --git a/dev-tools/docker/base/build-base-docker.sh b/dev-tools/docker/base/build-base-docker.sh index 9aab72c..d2d17fc 100755 ---