From aa4551abdce95866228250c77f132fcb21d66dce Mon Sep 17 00:00:00 2001 From: Adrian Hempel Date: Fri, 24 Aug 2018 16:11:37 +0100 Subject: [PATCH 01/79] Updating awscli version. --- ember-cli/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ember-cli/Dockerfile b/ember-cli/Dockerfile index 467ab5a..6251f86 100644 --- a/ember-cli/Dockerfile +++ b/ember-cli/Dockerfile @@ -67,5 +67,10 @@ RUN \ RUN \ apt-get update &&\ apt-get install -y \ - awscli \ jq + +RUN \ + curl https://bootstrap.pypa.io/get-pip.py | python + +RUN \ + pip install awscli From b15e89d5ba4abee25d158e47e4c401df19d159f4 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 17 Sep 2018 17:22:55 +0100 Subject: [PATCH 02/79] sbt 1.1.6 --- docker_base_openjdk_8_sbt/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker_base_openjdk_8_sbt/Dockerfile b/docker_base_openjdk_8_sbt/Dockerfile index 2b3e9ec..99f61c0 100644 --- a/docker_base_openjdk_8_sbt/Dockerfile +++ b/docker_base_openjdk_8_sbt/Dockerfile @@ -1,8 +1,8 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.12.4 -ENV SBT_VERSION 1.1.4 +ENV SCALA_VERSION 2.12.6 +ENV SBT_VERSION 1.1.6 # add a simple script that can auto-detect the appropriate JAVA_HOME value # based on whether the JDK or only the JRE is installed @@ -33,7 +33,7 @@ RUN apk add --update \ postgresql-dev \ curl \ bash \ - jq \ + jq \ && rm -rf /var/cache/apk/* From ad055f3375a4fbc72491c20ec96d6b0f4298ffb0 Mon Sep 17 00:00:00 2001 From: Charles Lee Date: Wed, 19 Sep 2018 11:22:21 +0100 Subject: [PATCH 03/79] updated java version to avoid https://github.com/docker-library/openjdk/issues/209 --- docker_base_openjdk_8_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_openjdk_8_sbt/Dockerfile b/docker_base_openjdk_8_sbt/Dockerfile index 99f61c0..78baffc 100644 --- a/docker_base_openjdk_8_sbt/Dockerfile +++ b/docker_base_openjdk_8_sbt/Dockerfile @@ -17,7 +17,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin ENV JAVA_VERSION 8u151 -ENV JAVA_ALPINE_VERSION 8.131.11-r2 +ENV JAVA_ALPINE_VERSION 8.171.11-r0 RUN set -x \ && apk add --no-cache \ From 32fff135ca63f875c5ed650a4081e3e3102eecfb Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 3 Dec 2018 10:14:19 +0100 Subject: [PATCH 04/79] upgrade sbt/scala/java versions --- docker_base_openjdk_8_sbt/Dockerfile | 10 +++++----- docker_base_openjdk_8_sbt/README.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker_base_openjdk_8_sbt/Dockerfile b/docker_base_openjdk_8_sbt/Dockerfile index 78baffc..4dab3c9 100644 --- a/docker_base_openjdk_8_sbt/Dockerfile +++ b/docker_base_openjdk_8_sbt/Dockerfile @@ -1,8 +1,8 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.12.6 -ENV SBT_VERSION 1.1.6 +ENV SCALA_VERSION 2.12.7 +ENV SBT_VERSION 1.2.7 # add a simple script that can auto-detect the appropriate JAVA_HOME value # based on whether the JDK or only the JRE is installed @@ -16,8 +16,8 @@ RUN { \ ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin -ENV JAVA_VERSION 8u151 -ENV JAVA_ALPINE_VERSION 8.171.11-r0 +ENV JAVA_VERSION 8u181 +ENV JAVA_ALPINE_VERSION 8.181.13-r0 RUN set -x \ && apk add --no-cache \ @@ -40,7 +40,7 @@ RUN apk add --update \ WORKDIR /root RUN \ - pip install awscli && \ + pip install awscli && \ curl -fsL https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \ echo >> /root/.bashrc && \ echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc diff --git a/docker_base_openjdk_8_sbt/README.md b/docker_base_openjdk_8_sbt/README.md index 3f54d80..a9c3e4c 100644 --- a/docker_base_openjdk_8_sbt/README.md +++ b/docker_base_openjdk_8_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_openjdk_8_sbt -openjdk 8 scala 2.11.7 and sbt 1.0.2 +openjdk 8 scala 2.12.7 and sbt 1.2.7 From f424a1e0ea7f41141e4a35908399a0043fe7f25c Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 1 Jan 2019 11:15:07 +0100 Subject: [PATCH 05/79] jdk11 build --- docker_base_openjdk_11_sbt/Dockerfile | 32 +++++++++++++++++++++++++++ docker_base_openjdk_11_sbt/README.md | 3 +++ 2 files changed, 35 insertions(+) create mode 100644 docker_base_openjdk_11_sbt/Dockerfile create mode 100644 docker_base_openjdk_11_sbt/README.md diff --git a/docker_base_openjdk_11_sbt/Dockerfile b/docker_base_openjdk_11_sbt/Dockerfile new file mode 100644 index 0000000..c727000 --- /dev/null +++ b/docker_base_openjdk_11_sbt/Dockerfile @@ -0,0 +1,32 @@ +FROM openjdk:11.0.1-jdk +ENV LANG C.UTF-8 + +ENV SCALA_VERSION 2.12.8 +ENV SBT_VERSION 1.2.7 + +RUN apk add --update \ + python \ + python-dev \ + py-pip \ + build-base \ + postgresql-client \ + postgresql-dev \ + curl \ + bash \ + jq \ + && rm -rf /var/cache/apk/* + + +WORKDIR /root + +RUN \ + pip install awscli && \ + curl -fsL https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \ + echo >> /root/.bashrc && \ + echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc + +RUN \ + curl -L -o sbt-$SBT_VERSION.tgz https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && tar -zxf sbt-$SBT_VERSION.tgz && \ + echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc + +RUN ./sbt/bin/sbt sbtVersion diff --git a/docker_base_openjdk_11_sbt/README.md b/docker_base_openjdk_11_sbt/README.md new file mode 100644 index 0000000..3aa0664 --- /dev/null +++ b/docker_base_openjdk_11_sbt/README.md @@ -0,0 +1,3 @@ +# docker_base_openjdk_11_sbt + +openjdk 11.0.1, scala 2.12.8 and sbt 1.2.7 From b288ca7fbbfab7077d7bcda3f4583a672c4ed7e7 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 1 Jan 2019 11:38:24 +0100 Subject: [PATCH 06/79] use apt-get --- docker_base_openjdk_11_sbt/Dockerfile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docker_base_openjdk_11_sbt/Dockerfile b/docker_base_openjdk_11_sbt/Dockerfile index c727000..353e63c 100644 --- a/docker_base_openjdk_11_sbt/Dockerfile +++ b/docker_base_openjdk_11_sbt/Dockerfile @@ -4,18 +4,16 @@ ENV LANG C.UTF-8 ENV SCALA_VERSION 2.12.8 ENV SBT_VERSION 1.2.7 -RUN apk add --update \ - python \ +RUN apt-get update && apt-get install -y --no-install-recommends \ + python-setuptools \ python-dev \ - py-pip \ - build-base \ + python-pip \ + libpython-dev \ postgresql-client \ - postgresql-dev \ curl \ bash \ jq \ - && rm -rf /var/cache/apk/* - + && rm -rf /var/lib/apt/lists/* WORKDIR /root From 921d10581d80402668734ba1899e6405ac5a46e5 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 1 Jan 2019 13:28:39 +0100 Subject: [PATCH 07/79] zulu jdk --- docker_base_zulujdk_8_sbt/Dockerfile | 32 ++++++++++++++++++++++++++++ docker_base_zulujdk_8_sbt/README.md | 3 +++ 2 files changed, 35 insertions(+) create mode 100644 docker_base_zulujdk_8_sbt/Dockerfile create mode 100644 docker_base_zulujdk_8_sbt/README.md diff --git a/docker_base_zulujdk_8_sbt/Dockerfile b/docker_base_zulujdk_8_sbt/Dockerfile new file mode 100644 index 0000000..de348d6 --- /dev/null +++ b/docker_base_zulujdk_8_sbt/Dockerfile @@ -0,0 +1,32 @@ +FROM azul/zulu-openjdk-alpine:8u192 +ENV LANG C.UTF-8 + +ENV SCALA_VERSION 2.12.8 +ENV SBT_VERSION 1.2.7 + +RUN apk add --update \ + python \ + python-dev \ + py-pip \ + build-base \ + postgresql-client \ + postgresql-dev \ + curl \ + bash \ + jq \ + && rm -rf /var/cache/apk/* + +WORKDIR /root + +RUN \ + pip install --upgrade pip && \ + pip install awscli && \ + curl -fsL https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \ + echo >> /root/.bashrc && \ + echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc + +RUN \ + curl -L -o sbt-$SBT_VERSION.tgz https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && tar -zxf sbt-$SBT_VERSION.tgz && \ + echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc + +RUN ./sbt/bin/sbt sbtVersion diff --git a/docker_base_zulujdk_8_sbt/README.md b/docker_base_zulujdk_8_sbt/README.md new file mode 100644 index 0000000..49b1977 --- /dev/null +++ b/docker_base_zulujdk_8_sbt/README.md @@ -0,0 +1,3 @@ +# docker_base_zulujdk_8_sbt + +zulu openjdk 8, scala 2.12.8 and sbt 1.2.7 From cc769c108bfd3efb6ebbe33707c91d202c98646b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 9 Jan 2019 15:08:54 +0100 Subject: [PATCH 08/79] zulu jdk 11 --- .../Dockerfile | 8 +++-- .../README.md | 0 docker_base_zulujdk_11_sbt/build.sbt | 1 + docker_base_zulujdk_8_sbt/Dockerfile | 32 ------------------- docker_base_zulujdk_8_sbt/README.md | 3 -- 5 files changed, 6 insertions(+), 38 deletions(-) rename {docker_base_openjdk_11_sbt => docker_base_zulujdk_11_sbt}/Dockerfile (79%) rename {docker_base_openjdk_11_sbt => docker_base_zulujdk_11_sbt}/README.md (100%) create mode 100644 docker_base_zulujdk_11_sbt/build.sbt delete mode 100644 docker_base_zulujdk_8_sbt/Dockerfile delete mode 100644 docker_base_zulujdk_8_sbt/README.md diff --git a/docker_base_openjdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile similarity index 79% rename from docker_base_openjdk_11_sbt/Dockerfile rename to docker_base_zulujdk_11_sbt/Dockerfile index 353e63c..8828071 100644 --- a/docker_base_openjdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM openjdk:11.0.1-jdk ENV LANG C.UTF-8 ENV SCALA_VERSION 2.12.8 -ENV SBT_VERSION 1.2.7 +ENV SBT_VERSION 1.2.8 RUN apt-get update && apt-get install -y --no-install-recommends \ python-setuptools \ @@ -24,7 +24,9 @@ RUN \ echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc RUN \ - curl -L -o sbt-$SBT_VERSION.tgz https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && tar -zxf sbt-$SBT_VERSION.tgz && \ + curl -L -o sbt-$SBT_VERSION.tgz https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ + tar -zxf sbt-$SBT_VERSION.tgz && \ echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc -RUN ./sbt/bin/sbt sbtVersion +COPY build.sbt . +RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt diff --git a/docker_base_openjdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md similarity index 100% rename from docker_base_openjdk_11_sbt/README.md rename to docker_base_zulujdk_11_sbt/README.md diff --git a/docker_base_zulujdk_11_sbt/build.sbt b/docker_base_zulujdk_11_sbt/build.sbt new file mode 100644 index 0000000..5642f16 --- /dev/null +++ b/docker_base_zulujdk_11_sbt/build.sbt @@ -0,0 +1 @@ +scalaVersion := "2.12.8" diff --git a/docker_base_zulujdk_8_sbt/Dockerfile b/docker_base_zulujdk_8_sbt/Dockerfile deleted file mode 100644 index de348d6..0000000 --- a/docker_base_zulujdk_8_sbt/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM azul/zulu-openjdk-alpine:8u192 -ENV LANG C.UTF-8 - -ENV SCALA_VERSION 2.12.8 -ENV SBT_VERSION 1.2.7 - -RUN apk add --update \ - python \ - python-dev \ - py-pip \ - build-base \ - postgresql-client \ - postgresql-dev \ - curl \ - bash \ - jq \ - && rm -rf /var/cache/apk/* - -WORKDIR /root - -RUN \ - pip install --upgrade pip && \ - pip install awscli && \ - curl -fsL https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \ - echo >> /root/.bashrc && \ - echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc - -RUN \ - curl -L -o sbt-$SBT_VERSION.tgz https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && tar -zxf sbt-$SBT_VERSION.tgz && \ - echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc - -RUN ./sbt/bin/sbt sbtVersion diff --git a/docker_base_zulujdk_8_sbt/README.md b/docker_base_zulujdk_8_sbt/README.md deleted file mode 100644 index 49b1977..0000000 --- a/docker_base_zulujdk_8_sbt/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# docker_base_zulujdk_8_sbt - -zulu openjdk 8, scala 2.12.8 and sbt 1.2.7 From a72797046d54f1c89036160b3647f3c7f7c7a2b5 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 9 Jan 2019 15:11:33 +0100 Subject: [PATCH 09/79] Update README.md --- docker_base_zulujdk_11_sbt/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 3aa0664..36350e9 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ -# docker_base_openjdk_11_sbt +# docker_base_zulujdk_11_sbt -openjdk 11.0.1, scala 2.12.8 and sbt 1.2.7 +zulu openjdk 11.0.1, scala 2.12.8 and sbt 1.2.8 From 8cc70317631f10f691d1eb345e4637aba523feac Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 9 Jan 2019 17:06:50 +0100 Subject: [PATCH 10/79] use docker latest as base image --- docker_base_zulujdk_11_sbt/Dockerfile | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 8828071..aa1b88c 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -1,19 +1,33 @@ -FROM openjdk:11.0.1-jdk +FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.12.8 ENV SBT_VERSION 1.2.8 -RUN apt-get update && apt-get install -y --no-install-recommends \ - python-setuptools \ +RUN apk add --update \ + python \ python-dev \ - python-pip \ - libpython-dev \ + py-pip \ + build-base \ postgresql-client \ + postgresql-dev \ curl \ bash \ jq \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/cache/apk/* + +RUN ZULU_ARCH=zulu11.2.3-jdk11.0.1-linux_musl_x64.tar.gz && \ + INSTALL_DIR=/usr/lib/jvm && \ + BIN_DIR=/usr/bin && \ + MAN_DIR=/usr/share/man/man1 && \ + ZULU_DIR=$( basename ${ZULU_ARCH} .tar.gz ) && \ + wget -q https://cdn.azul.com/zulu/bin/${ZULU_ARCH} && \ + mkdir -p ${INSTALL_DIR} && \ + tar -xf ./${ZULU_ARCH} -C ${INSTALL_DIR} && rm -f ${ZULU_ARCH} && \ + cd ${BIN_DIR} && find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \ + mkdir -p ${MAN_DIR} && \ + cd ${MAN_DIR} && find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \; && \ + java -version WORKDIR /root From 624d1560313a9e66bb5f112117a35cb0e9871225 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 5 Mar 2019 21:11:55 +0100 Subject: [PATCH 11/79] upgrade node --- ember-cli/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ember-cli/Dockerfile b/ember-cli/Dockerfile index 6251f86..92189b7 100644 --- a/ember-cli/Dockerfile +++ b/ember-cli/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.11.3 +FROM node:8.15.1 # ember server on port 4200 # livereload server on port 49153 (changed in v2.11.1 from 49152) From 33d9108c307ed39516f5306cc48954fa558c1def Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 8 Mar 2019 23:38:27 +0100 Subject: [PATCH 12/79] upgrade java due to occasional sig faults --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index aa1b88c..34930e7 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -16,7 +16,7 @@ RUN apk add --update \ jq \ && rm -rf /var/cache/apk/* -RUN ZULU_ARCH=zulu11.2.3-jdk11.0.1-linux_musl_x64.tar.gz && \ +RUN ZULU_ARCH=zulu11.29.11-ca-jdk11.0.2-linux_musl_x64.tar.gz && \ INSTALL_DIR=/usr/lib/jvm && \ BIN_DIR=/usr/bin && \ MAN_DIR=/usr/share/man/man1 && \ From 0a43bc24c92e9adaae7127681aee8ac3ea8dd5e8 Mon Sep 17 00:00:00 2001 From: Charles Lee Date: Wed, 13 Mar 2019 12:25:12 +0000 Subject: [PATCH 13/79] updated --- docker_base_zulujdk_11_sbt/Dockerfile | 1 + ember-cli/Dockerfile | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 34930e7..ea77c41 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -14,6 +14,7 @@ RUN apk add --update \ curl \ bash \ jq \ + openssl \ && rm -rf /var/cache/apk/* RUN ZULU_ARCH=zulu11.29.11-ca-jdk11.0.2-linux_musl_x64.tar.gz && \ diff --git a/ember-cli/Dockerfile b/ember-cli/Dockerfile index 92189b7..d98be05 100644 --- a/ember-cli/Dockerfile +++ b/ember-cli/Dockerfile @@ -28,7 +28,8 @@ RUN \ # Install ember dev dependencies RUN \ - npm install -g bower@1.8.0 + npm install -g bower@1.8.0 \ + npm i -g npm # install official phantomjs binaries RUN \ @@ -59,7 +60,7 @@ RUN \ # Install ember-cli RUN \ - yarn global add ember-cli@3.1.2 + yarn global add ember-cli@3.7.1 RUN \ yarn global add firebase-tools From e1833eccc1a88bf153b3e4510eb8f5efa00ba06a Mon Sep 17 00:00:00 2001 From: Charles Lee Date: Sun, 7 Jul 2019 01:37:07 +0100 Subject: [PATCH 14/79] change node version --- ember-cli/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ember-cli/Dockerfile b/ember-cli/Dockerfile index d98be05..5b6ac52 100644 --- a/ember-cli/Dockerfile +++ b/ember-cli/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.15.1 +FROM node:10.16.0 # ember server on port 4200 # livereload server on port 49153 (changed in v2.11.1 from 49152) @@ -60,7 +60,7 @@ RUN \ # Install ember-cli RUN \ - yarn global add ember-cli@3.7.1 + yarn global add ember-cli@3.10.1 RUN \ yarn global add firebase-tools From b20c86d8cea6fc07156a6fd6033d2fa552dfcd70 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 26 Jul 2019 08:41:52 +0100 Subject: [PATCH 15/79] upgrade zulu jdk --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index ea77c41..fc86adb 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -17,7 +17,7 @@ RUN apk add --update \ openssl \ && rm -rf /var/cache/apk/* -RUN ZULU_ARCH=zulu11.29.11-ca-jdk11.0.2-linux_musl_x64.tar.gz && \ +RUN ZULU_ARCH=zulu11.33.15-ca-jdk11.0.4-linux_musl_x64.tar.gz && \ INSTALL_DIR=/usr/lib/jvm && \ BIN_DIR=/usr/bin && \ MAN_DIR=/usr/share/man/man1 && \ From c20350f2ebc4b256b30e60cab742a38f038d84cc Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 25 Jan 2020 16:00:21 +0000 Subject: [PATCH 16/79] java 11.0.6 scala 2.13.1 sbt 1.3.7 --- docker_base_zulujdk_11_sbt/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index fc86adb..e0c9d6d 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -1,8 +1,8 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.12.8 -ENV SBT_VERSION 1.2.8 +ENV SCALA_VERSION 2.13.1 +ENV SBT_VERSION 1.3.7 RUN apk add --update \ python \ @@ -17,7 +17,7 @@ RUN apk add --update \ openssl \ && rm -rf /var/cache/apk/* -RUN ZULU_ARCH=zulu11.33.15-ca-jdk11.0.4-linux_musl_x64.tar.gz && \ +RUN ZULU_ARCH=zulu11.37.17-ca-jdk11.0.6-linux_musl_x64.tar.gz && \ INSTALL_DIR=/usr/lib/jvm && \ BIN_DIR=/usr/bin && \ MAN_DIR=/usr/share/man/man1 && \ From ab12f9a82d9f7d4e9d8fcffdae5b50ceb6c2803f Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 27 Jan 2020 21:42:55 +0000 Subject: [PATCH 17/79] sbt upgrade --- docker_base_zulujdk_11_sbt/README.md | 2 +- docker_base_zulujdk_11_sbt/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 36350e9..f469466 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.1, scala 2.12.8 and sbt 1.2.8 +zulu openjdk 11.0.6, scala 2.13.1 and sbt 1.3.7 diff --git a/docker_base_zulujdk_11_sbt/build.sbt b/docker_base_zulujdk_11_sbt/build.sbt index 5642f16..ef6e854 100644 --- a/docker_base_zulujdk_11_sbt/build.sbt +++ b/docker_base_zulujdk_11_sbt/build.sbt @@ -1 +1 @@ -scalaVersion := "2.12.8" +scalaVersion := "2.13.1" From 94913b3fb5608e492fe53e503a63553aad012760 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 18 Mar 2020 22:03:53 +0100 Subject: [PATCH 18/79] java 14 --- docker_base_zulujdk_14_sbt/Dockerfile | 47 +++++++++++++++++++++++++++ docker_base_zulujdk_14_sbt/README.md | 3 ++ docker_base_zulujdk_14_sbt/build.sbt | 1 + 3 files changed, 51 insertions(+) create mode 100644 docker_base_zulujdk_14_sbt/Dockerfile create mode 100644 docker_base_zulujdk_14_sbt/README.md create mode 100644 docker_base_zulujdk_14_sbt/build.sbt diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile new file mode 100644 index 0000000..9404254 --- /dev/null +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -0,0 +1,47 @@ +FROM docker:latest +ENV LANG C.UTF-8 + +ENV SCALA_VERSION 2.13.1 +ENV SBT_VERSION 1.3.8 + +RUN apk add --update \ + python \ + python-dev \ + py-pip \ + build-base \ + postgresql-client \ + postgresql-dev \ + curl \ + bash \ + jq \ + openssl \ + && rm -rf /var/cache/apk/* + +RUN ZULU_ARCH=zulu14.27.1-ca-jdk14-linux_musl_x64.tar.gz && \ + INSTALL_DIR=/usr/lib/jvm && \ + BIN_DIR=/usr/bin && \ + MAN_DIR=/usr/share/man/man1 && \ + ZULU_DIR=$( basename ${ZULU_ARCH} .tar.gz ) && \ + wget -q https://cdn.azul.com/zulu/bin/${ZULU_ARCH} && \ + mkdir -p ${INSTALL_DIR} && \ + tar -xf ./${ZULU_ARCH} -C ${INSTALL_DIR} && rm -f ${ZULU_ARCH} && \ + cd ${BIN_DIR} && find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \ + mkdir -p ${MAN_DIR} && \ + cd ${MAN_DIR} && find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \; && \ + java -version + +WORKDIR /root + +RUN \ + pip install awscli && \ + curl -fsL https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \ + echo >> /root/.bashrc && \ + echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc + +RUN \ + curl -L -o sbt-$SBT_VERSION.tgz https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ + tar -zxf sbt-$SBT_VERSION.tgz && \ + echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc + +COPY build.sbt . +RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt diff --git a/docker_base_zulujdk_14_sbt/README.md b/docker_base_zulujdk_14_sbt/README.md new file mode 100644 index 0000000..ed4bf6a --- /dev/null +++ b/docker_base_zulujdk_14_sbt/README.md @@ -0,0 +1,3 @@ +# docker_base_zulujdk_14_sbt + +zulu openjdk 14.0.0, scala 2.13.1 and sbt 1.3.8 diff --git a/docker_base_zulujdk_14_sbt/build.sbt b/docker_base_zulujdk_14_sbt/build.sbt new file mode 100644 index 0000000..ef6e854 --- /dev/null +++ b/docker_base_zulujdk_14_sbt/build.sbt @@ -0,0 +1 @@ +scalaVersion := "2.13.1" From 5fa2d3b7be9e37224de6d76e83e50acf7fa5bf76 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 1 Apr 2020 00:15:47 +0200 Subject: [PATCH 19/79] sbt 1.3.9 --- docker_base_zulujdk_14_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index 9404254..9da8296 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.1 -ENV SBT_VERSION 1.3.8 +ENV SBT_VERSION 1.3.9 RUN apk add --update \ python \ From d9ebf4dfde5bf00dee3b259ec3d57b7dbcad9274 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 16 Apr 2020 08:57:34 +0200 Subject: [PATCH 20/79] sbt 1.3.10 --- docker_base_zulujdk_14_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index 9da8296..5bdbea7 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.1 -ENV SBT_VERSION 1.3.9 +ENV SBT_VERSION 1.3.10 RUN apk add --update \ python \ From 3fbe7ecbc261883230cb326f77e4d4f236cbba08 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 20 Apr 2020 00:03:09 +0200 Subject: [PATCH 21/79] java 14.0.1 --- docker_base_zulujdk_14_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index 5bdbea7..b0be946 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -17,7 +17,7 @@ RUN apk add --update \ openssl \ && rm -rf /var/cache/apk/* -RUN ZULU_ARCH=zulu14.27.1-ca-jdk14-linux_musl_x64.tar.gz && \ +RUN ZULU_ARCH=zulu14.28.21-ca-jdk14.0.1-linux_musl_x64.tar.gz && \ INSTALL_DIR=/usr/lib/jvm && \ BIN_DIR=/usr/bin && \ MAN_DIR=/usr/share/man/man1 && \ From 48d95b914487be8922f5f158945f912357171eb2 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 23 Apr 2020 10:32:31 +0200 Subject: [PATCH 22/79] scala 2.13.2 --- docker_base_zulujdk_14_sbt/Dockerfile | 2 +- docker_base_zulujdk_14_sbt/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index b0be946..74940ff 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -1,7 +1,7 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.13.1 +ENV SCALA_VERSION 2.13.2 ENV SBT_VERSION 1.3.10 RUN apk add --update \ diff --git a/docker_base_zulujdk_14_sbt/build.sbt b/docker_base_zulujdk_14_sbt/build.sbt index ef6e854..3153748 100644 --- a/docker_base_zulujdk_14_sbt/build.sbt +++ b/docker_base_zulujdk_14_sbt/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.1" +scalaVersion := "2.13.2" From 25f1269cf29fe8ee26362ba15dc2972ad88f763e Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 29 May 2020 21:41:49 +0200 Subject: [PATCH 23/79] sbt 1.3.11 --- docker_base_zulujdk_14_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index 74940ff..a40df4c 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.2 -ENV SBT_VERSION 1.3.10 +ENV SBT_VERSION 1.3.11 RUN apk add --update \ python \ From 371ec4a729b54e77a4ee7c792d4ebaa5d1740d32 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 31 May 2020 12:17:00 +0200 Subject: [PATCH 24/79] Update README.md --- docker_base_zulujdk_14_sbt/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_14_sbt/README.md b/docker_base_zulujdk_14_sbt/README.md index ed4bf6a..bdd2fac 100644 --- a/docker_base_zulujdk_14_sbt/README.md +++ b/docker_base_zulujdk_14_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_14_sbt -zulu openjdk 14.0.0, scala 2.13.1 and sbt 1.3.8 +zulu openjdk 14.0.1, scala 2.13.2 and sbt 1.3.11 From 6821387ffabe4b4db4c6155cfea3ddf7e54e2e50 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 31 May 2020 13:08:52 +0200 Subject: [PATCH 25/79] sbt 1.3.12 --- docker_base_zulujdk_14_sbt/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index a40df4c..b46eb52 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -1,8 +1,8 @@ FROM docker:latest -ENV LANG C.UTF-8 +ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.2 -ENV SBT_VERSION 1.3.11 +ENV SBT_VERSION 1.3.12 RUN apk add --update \ python \ @@ -12,6 +12,7 @@ RUN apk add --update \ postgresql-client \ postgresql-dev \ curl \ + wget \ bash \ jq \ openssl \ @@ -34,7 +35,8 @@ WORKDIR /root RUN \ pip install awscli && \ - curl -fsL https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \ + wget "https://downloads.typesafe.com/scala/${SCALA_VERSION}/scala-${SCALA_VERSION}.tgz" && \ + tar -zxf "scala-${SCALA_VERSION}.tgz" && \ echo >> /root/.bashrc && \ echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc From 716cf2d1999a4f96bc45c588a207ea1fdf4280dd Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 26 Jun 2020 17:47:12 +0200 Subject: [PATCH 26/79] scala 2.13.3 --- docker_base_zulujdk_14_sbt/Dockerfile | 2 +- docker_base_zulujdk_14_sbt/README.md | 2 +- docker_base_zulujdk_14_sbt/build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index b46eb52..e33ce31 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -1,7 +1,7 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.13.2 +ENV SCALA_VERSION 2.13.3 ENV SBT_VERSION 1.3.12 RUN apk add --update \ diff --git a/docker_base_zulujdk_14_sbt/README.md b/docker_base_zulujdk_14_sbt/README.md index bdd2fac..d7659ec 100644 --- a/docker_base_zulujdk_14_sbt/README.md +++ b/docker_base_zulujdk_14_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_14_sbt -zulu openjdk 14.0.1, scala 2.13.2 and sbt 1.3.11 +zulu openjdk 14.0.1, scala 2.13.3 and sbt 1.3.12 diff --git a/docker_base_zulujdk_14_sbt/build.sbt b/docker_base_zulujdk_14_sbt/build.sbt index 3153748..a5064ca 100644 --- a/docker_base_zulujdk_14_sbt/build.sbt +++ b/docker_base_zulujdk_14_sbt/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.2" +scalaVersion := "2.13.3" From 8e62d278d12b3d1b788924fdcadd5e08886af905 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 28 Jun 2020 09:53:41 +0200 Subject: [PATCH 27/79] sbt 1.3.13 --- docker_base_zulujdk_14_sbt/Dockerfile | 4 ++-- docker_base_zulujdk_14_sbt/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index e33ce31..d43ae4a 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.3 -ENV SBT_VERSION 1.3.12 +ENV SBT_VERSION 1.3.13 RUN apk add --update \ python \ @@ -41,7 +41,7 @@ RUN \ echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc RUN \ - curl -L -o sbt-$SBT_VERSION.tgz https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ + wget https://piccolo.link/sbt-$SBT_VERSION.tgz && \ tar -zxf sbt-$SBT_VERSION.tgz && \ echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc diff --git a/docker_base_zulujdk_14_sbt/README.md b/docker_base_zulujdk_14_sbt/README.md index d7659ec..a3bcbbf 100644 --- a/docker_base_zulujdk_14_sbt/README.md +++ b/docker_base_zulujdk_14_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_14_sbt -zulu openjdk 14.0.1, scala 2.13.3 and sbt 1.3.12 +zulu openjdk 14.0.1, scala 2.13.3 and sbt 1.3.13 From ef82372f463ef6ce5752882c04f0062cc029d878 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 21 Jul 2020 16:43:30 +0200 Subject: [PATCH 28/79] java 14.0.2 --- docker_base_zulujdk_14_sbt/Dockerfile | 2 +- docker_base_zulujdk_14_sbt/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index d43ae4a..997a67b 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -18,7 +18,7 @@ RUN apk add --update \ openssl \ && rm -rf /var/cache/apk/* -RUN ZULU_ARCH=zulu14.28.21-ca-jdk14.0.1-linux_musl_x64.tar.gz && \ +RUN ZULU_ARCH=zulu14.29.23-ca-jdk14.0.2-linux_musl_x64.tar.gz && \ INSTALL_DIR=/usr/lib/jvm && \ BIN_DIR=/usr/bin && \ MAN_DIR=/usr/share/man/man1 && \ diff --git a/docker_base_zulujdk_14_sbt/README.md b/docker_base_zulujdk_14_sbt/README.md index a3bcbbf..6e98e9d 100644 --- a/docker_base_zulujdk_14_sbt/README.md +++ b/docker_base_zulujdk_14_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_14_sbt -zulu openjdk 14.0.1, scala 2.13.3 and sbt 1.3.13 +zulu openjdk 14.0.2, scala 2.13.3 and sbt 1.3.13 From 6253683f462b762cb27bb73bfcea31c8d13e20fe Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 5 Oct 2020 14:15:12 +0100 Subject: [PATCH 29/79] sbt 1.4.0 --- docker_base_zulujdk_14_sbt/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index 997a67b..4dcec9d 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.3 -ENV SBT_VERSION 1.3.13 +ENV SBT_VERSION 1.4.0 RUN apk add --update \ python \ @@ -41,7 +41,7 @@ RUN \ echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc RUN \ - wget https://piccolo.link/sbt-$SBT_VERSION.tgz && \ + wget https://github.com/sbt/sbt/releases/download/v1.4.0/sbt-$SBT_VERSION.tgz && \ tar -zxf sbt-$SBT_VERSION.tgz && \ echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc From 84c2c58e08133a77ee910296b659c0c9d7a7b865 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 5 Oct 2020 15:45:06 +0100 Subject: [PATCH 30/79] try python3 --- docker_base_zulujdk_14_sbt/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index 4dcec9d..4af8c45 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -5,9 +5,9 @@ ENV SCALA_VERSION 2.13.3 ENV SBT_VERSION 1.4.0 RUN apk add --update \ - python \ - python-dev \ - py-pip \ + python3 \ + python3-dev \ + py3-pip \ build-base \ postgresql-client \ postgresql-dev \ From 45a839c7612ac45db97c6221ed010030f32b37f5 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 5 Oct 2020 22:10:20 +0100 Subject: [PATCH 31/79] Update README.md --- docker_base_zulujdk_14_sbt/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_14_sbt/README.md b/docker_base_zulujdk_14_sbt/README.md index 6e98e9d..c678b8b 100644 --- a/docker_base_zulujdk_14_sbt/README.md +++ b/docker_base_zulujdk_14_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_14_sbt -zulu openjdk 14.0.2, scala 2.13.3 and sbt 1.3.13 +zulu openjdk 14.0.2, scala 2.13.3 and sbt 1.4.0 From 8f2f5366c4903c48c0c452fd8a927cd77f7661c9 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 19 Oct 2020 22:04:29 +0100 Subject: [PATCH 32/79] SBT_VERSION 1.4.1 --- docker_base_zulujdk_14_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index 4af8c45..51085eb 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.3 -ENV SBT_VERSION 1.4.0 +ENV SBT_VERSION 1.4.1 RUN apk add --update \ python3 \ From 7633a3d59a4420cdc4ebeeda9c3d0c59cb2c3fd9 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 19 Oct 2020 22:26:00 +0100 Subject: [PATCH 33/79] Update Dockerfile --- docker_base_zulujdk_14_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index 51085eb..883996b 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -41,7 +41,7 @@ RUN \ echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc RUN \ - wget https://github.com/sbt/sbt/releases/download/v1.4.0/sbt-$SBT_VERSION.tgz && \ + wget https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ tar -zxf sbt-$SBT_VERSION.tgz && \ echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc From 4c74408f3553a14039e77075c4b40b950ade9108 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 2 Nov 2020 09:24:31 +0000 Subject: [PATCH 34/79] Update README.md --- docker_base_zulujdk_14_sbt/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_14_sbt/README.md b/docker_base_zulujdk_14_sbt/README.md index c678b8b..c6cc52c 100644 --- a/docker_base_zulujdk_14_sbt/README.md +++ b/docker_base_zulujdk_14_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_14_sbt -zulu openjdk 14.0.2, scala 2.13.3 and sbt 1.4.0 +zulu openjdk 14.0.2, scala 2.13.3 and sbt 1.4.2 From 65e4beafcbb05ada29ba3dd21fda30adf3e97800 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 2 Nov 2020 09:24:56 +0000 Subject: [PATCH 35/79] Update Dockerfile --- docker_base_zulujdk_14_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index 883996b..4653105 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.3 -ENV SBT_VERSION 1.4.1 +ENV SBT_VERSION 1.4.2 RUN apk add --update \ python3 \ From 38082eec24b9dfb1335931d28f2764c9cc13d50b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 12 Nov 2020 22:44:06 +0000 Subject: [PATCH 36/79] zulu15 build --- docker_base_zulujdk_15_sbt/Dockerfile | 49 +++++++++++++++++++++++++++ docker_base_zulujdk_15_sbt/README.md | 3 ++ docker_base_zulujdk_15_sbt/build.sbt | 1 + 3 files changed, 53 insertions(+) create mode 100644 docker_base_zulujdk_15_sbt/Dockerfile create mode 100644 docker_base_zulujdk_15_sbt/README.md create mode 100644 docker_base_zulujdk_15_sbt/build.sbt diff --git a/docker_base_zulujdk_15_sbt/Dockerfile b/docker_base_zulujdk_15_sbt/Dockerfile new file mode 100644 index 0000000..d0dc309 --- /dev/null +++ b/docker_base_zulujdk_15_sbt/Dockerfile @@ -0,0 +1,49 @@ +FROM docker:latest +ENV LANG C.UTF-8 + +ENV SCALA_VERSION 2.13.3 +ENV SBT_VERSION 1.4.2 + +RUN apk add --update \ + python3 \ + python3-dev \ + py3-pip \ + build-base \ + postgresql-client \ + postgresql-dev \ + curl \ + wget \ + bash \ + jq \ + openssl \ + && rm -rf /var/cache/apk/* + +RUN ZULU_ARCH=zulu15.28.13-ca-jdk15.0.1-linux_musl_x64.tar.gz && \ + INSTALL_DIR=/usr/lib/jvm && \ + BIN_DIR=/usr/bin && \ + MAN_DIR=/usr/share/man/man1 && \ + ZULU_DIR=$( basename ${ZULU_ARCH} .tar.gz ) && \ + wget -q https://cdn.azul.com/zulu/bin/${ZULU_ARCH} && \ + mkdir -p ${INSTALL_DIR} && \ + tar -xf ./${ZULU_ARCH} -C ${INSTALL_DIR} && rm -f ${ZULU_ARCH} && \ + cd ${BIN_DIR} && find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \ + mkdir -p ${MAN_DIR} && \ + cd ${MAN_DIR} && find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \; && \ + java -version + +WORKDIR /root + +RUN \ + pip install awscli && \ + wget "https://downloads.typesafe.com/scala/${SCALA_VERSION}/scala-${SCALA_VERSION}.tgz" && \ + tar -zxf "scala-${SCALA_VERSION}.tgz" && \ + echo >> /root/.bashrc && \ + echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc + +RUN \ + wget https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ + tar -zxf sbt-$SBT_VERSION.tgz && \ + echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc + +COPY build.sbt . +RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt diff --git a/docker_base_zulujdk_15_sbt/README.md b/docker_base_zulujdk_15_sbt/README.md new file mode 100644 index 0000000..3fe524e --- /dev/null +++ b/docker_base_zulujdk_15_sbt/README.md @@ -0,0 +1,3 @@ +# docker_base_zulujdk_15_sbt + +zulu openjdk 15.0.1, scala 2.13.3 and sbt 1.4.2 diff --git a/docker_base_zulujdk_15_sbt/build.sbt b/docker_base_zulujdk_15_sbt/build.sbt new file mode 100644 index 0000000..a5064ca --- /dev/null +++ b/docker_base_zulujdk_15_sbt/build.sbt @@ -0,0 +1 @@ +scalaVersion := "2.13.3" From 35f5823e711b84034bfacbb798971303d732de37 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 13 Nov 2020 11:06:46 +0000 Subject: [PATCH 37/79] latest versions --- docker_base_zulujdk_11_sbt/Dockerfile | 6 +++--- docker_base_zulujdk_11_sbt/README.md | 2 +- docker_base_zulujdk_11_sbt/build.sbt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index e0c9d6d..9d90c09 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -1,8 +1,8 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.13.1 -ENV SBT_VERSION 1.3.7 +ENV SCALA_VERSION 2.13.3 +ENV SBT_VERSION 1.4.2 RUN apk add --update \ python \ @@ -17,7 +17,7 @@ RUN apk add --update \ openssl \ && rm -rf /var/cache/apk/* -RUN ZULU_ARCH=zulu11.37.17-ca-jdk11.0.6-linux_musl_x64.tar.gz && \ +RUN ZULU_ARCH=zulu11.43.55-ca-jdk11.0.9.1-linux_musl_x64.tar.gz && \ INSTALL_DIR=/usr/lib/jvm && \ BIN_DIR=/usr/bin && \ MAN_DIR=/usr/share/man/man1 && \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index f469466..987f835 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.6, scala 2.13.1 and sbt 1.3.7 +zulu openjdk 11.0.9, scala 2.13.3 and sbt 1.4.2 diff --git a/docker_base_zulujdk_11_sbt/build.sbt b/docker_base_zulujdk_11_sbt/build.sbt index ef6e854..a5064ca 100644 --- a/docker_base_zulujdk_11_sbt/build.sbt +++ b/docker_base_zulujdk_11_sbt/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.1" +scalaVersion := "2.13.3" From 1a4d44dbb10147b7a1990030829bbbadfebfea39 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 13 Nov 2020 11:29:02 +0000 Subject: [PATCH 38/79] Update Dockerfile --- docker_base_zulujdk_11_sbt/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 9d90c09..8fddce7 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -5,13 +5,14 @@ ENV SCALA_VERSION 2.13.3 ENV SBT_VERSION 1.4.2 RUN apk add --update \ - python \ - python-dev \ - py-pip \ + python3 \ + python3-dev \ + py3-pip \ build-base \ postgresql-client \ postgresql-dev \ curl \ + wget \ bash \ jq \ openssl \ From e865eaf3f44f0704b583e2c3d63482c735d368d6 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 13 Nov 2020 11:40:57 +0000 Subject: [PATCH 39/79] Update Dockerfile --- docker_base_zulujdk_11_sbt/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 8fddce7..c4b942b 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -35,12 +35,13 @@ WORKDIR /root RUN \ pip install awscli && \ - curl -fsL https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \ + wget "https://downloads.typesafe.com/scala/${SCALA_VERSION}/scala-${SCALA_VERSION}.tgz" && \ + tar -zxf "scala-${SCALA_VERSION}.tgz" && \ echo >> /root/.bashrc && \ echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc RUN \ - curl -L -o sbt-$SBT_VERSION.tgz https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ + wget https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ tar -zxf sbt-$SBT_VERSION.tgz && \ echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc From aa406e197c03f030969595f6d2ee1bafe9d0a13b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 16 Nov 2020 09:14:14 +0000 Subject: [PATCH 40/79] sbt 1.4.3 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index c4b942b..098f3b1 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.3 -ENV SBT_VERSION 1.4.2 +ENV SBT_VERSION 1.4.3 RUN apk add --update \ python3 \ From 4d7b9ef0b31c9bde6f6083e6721aa5afca01c694 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 16 Nov 2020 09:14:52 +0000 Subject: [PATCH 41/79] Update README.md --- docker_base_zulujdk_11_sbt/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 987f835..7e58375 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.9, scala 2.13.3 and sbt 1.4.2 +zulu openjdk 11.0.9, scala 2.13.3 and sbt 1.4.3 From b7579b9cd7f31f665166fb2b207adfc023454cdc Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 20 Nov 2020 10:22:56 +0000 Subject: [PATCH 42/79] scala 2.13.4 --- docker_base_zulujdk_11_sbt/README.md | 2 +- docker_base_zulujdk_11_sbt/build.sbt | 2 +- docker_base_zulujdk_14_sbt/build.sbt | 2 +- docker_base_zulujdk_15_sbt/build.sbt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 7e58375..90fe9db 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.9, scala 2.13.3 and sbt 1.4.3 +zulu openjdk 11.0.9, scala 2.13.4 and sbt 1.4.3 diff --git a/docker_base_zulujdk_11_sbt/build.sbt b/docker_base_zulujdk_11_sbt/build.sbt index a5064ca..35a1281 100644 --- a/docker_base_zulujdk_11_sbt/build.sbt +++ b/docker_base_zulujdk_11_sbt/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.3" +scalaVersion := "2.13.4" diff --git a/docker_base_zulujdk_14_sbt/build.sbt b/docker_base_zulujdk_14_sbt/build.sbt index a5064ca..35a1281 100644 --- a/docker_base_zulujdk_14_sbt/build.sbt +++ b/docker_base_zulujdk_14_sbt/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.3" +scalaVersion := "2.13.4" diff --git a/docker_base_zulujdk_15_sbt/build.sbt b/docker_base_zulujdk_15_sbt/build.sbt index a5064ca..35a1281 100644 --- a/docker_base_zulujdk_15_sbt/build.sbt +++ b/docker_base_zulujdk_15_sbt/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.3" +scalaVersion := "2.13.4" From 97a5cdd7e56aa8fde19bb20b92896a45bd3f8ed5 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 23 Nov 2020 11:17:54 +0000 Subject: [PATCH 43/79] sbt 1.4.4 --- docker_base_zulujdk_11_sbt/Dockerfile | 4 ++-- docker_base_zulujdk_11_sbt/README.md | 2 +- docker_base_zulujdk_14_sbt/Dockerfile | 4 ++-- docker_base_zulujdk_14_sbt/README.md | 2 +- docker_base_zulujdk_15_sbt/Dockerfile | 4 ++-- docker_base_zulujdk_15_sbt/README.md | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 098f3b1..7ddaf84 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -1,8 +1,8 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.13.3 -ENV SBT_VERSION 1.4.3 +ENV SCALA_VERSION 2.13.4 +ENV SBT_VERSION 1.4.4 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 90fe9db..8f33088 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.9, scala 2.13.4 and sbt 1.4.3 +zulu openjdk 11.0.9, scala 2.13.4 and sbt 1.4.4 diff --git a/docker_base_zulujdk_14_sbt/Dockerfile b/docker_base_zulujdk_14_sbt/Dockerfile index 4653105..bc1c43b 100644 --- a/docker_base_zulujdk_14_sbt/Dockerfile +++ b/docker_base_zulujdk_14_sbt/Dockerfile @@ -1,8 +1,8 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.13.3 -ENV SBT_VERSION 1.4.2 +ENV SCALA_VERSION 2.13.4 +ENV SBT_VERSION 1.4.4 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_14_sbt/README.md b/docker_base_zulujdk_14_sbt/README.md index c6cc52c..b293d9c 100644 --- a/docker_base_zulujdk_14_sbt/README.md +++ b/docker_base_zulujdk_14_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_14_sbt -zulu openjdk 14.0.2, scala 2.13.3 and sbt 1.4.2 +zulu openjdk 14.0.2, scala 2.13.4 and sbt 1.4.4 diff --git a/docker_base_zulujdk_15_sbt/Dockerfile b/docker_base_zulujdk_15_sbt/Dockerfile index d0dc309..5c37ffe 100644 --- a/docker_base_zulujdk_15_sbt/Dockerfile +++ b/docker_base_zulujdk_15_sbt/Dockerfile @@ -1,8 +1,8 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.13.3 -ENV SBT_VERSION 1.4.2 +ENV SCALA_VERSION 2.13.4 +ENV SBT_VERSION 1.4.4 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_15_sbt/README.md b/docker_base_zulujdk_15_sbt/README.md index 3fe524e..a12a54e 100644 --- a/docker_base_zulujdk_15_sbt/README.md +++ b/docker_base_zulujdk_15_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_15_sbt -zulu openjdk 15.0.1, scala 2.13.3 and sbt 1.4.2 +zulu openjdk 15.0.1, scala 2.13.4 and sbt 1.4.4 From cbb5471f809d17780c9bcce82e0787eaae7708a0 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 21 Dec 2020 14:06:08 +0000 Subject: [PATCH 44/79] sbt 1.4.5 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 7ddaf84..091c0a6 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.4 -ENV SBT_VERSION 1.4.4 +ENV SBT_VERSION 1.4.5 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 8f33088..759b292 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.9, scala 2.13.4 and sbt 1.4.4 +zulu openjdk 11.0.9, scala 2.13.4 and sbt 1.4.5 From d116b38f6710f1b675cfde907f0798ef984384b2 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 24 Dec 2020 10:39:52 +0000 Subject: [PATCH 45/79] sbt 1.4.6 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- docker_base_zulujdk_15_sbt/Dockerfile | 2 +- docker_base_zulujdk_15_sbt/README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 091c0a6..fac7e26 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.4 -ENV SBT_VERSION 1.4.5 +ENV SBT_VERSION 1.4.6 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 759b292..e326a11 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.9, scala 2.13.4 and sbt 1.4.5 +zulu openjdk 11.0.9, scala 2.13.4 and sbt 1.4.6 diff --git a/docker_base_zulujdk_15_sbt/Dockerfile b/docker_base_zulujdk_15_sbt/Dockerfile index 5c37ffe..82309d4 100644 --- a/docker_base_zulujdk_15_sbt/Dockerfile +++ b/docker_base_zulujdk_15_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.4 -ENV SBT_VERSION 1.4.4 +ENV SBT_VERSION 1.4.6 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_15_sbt/README.md b/docker_base_zulujdk_15_sbt/README.md index a12a54e..1631eda 100644 --- a/docker_base_zulujdk_15_sbt/README.md +++ b/docker_base_zulujdk_15_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_15_sbt -zulu openjdk 15.0.1, scala 2.13.4 and sbt 1.4.4 +zulu openjdk 15.0.1, scala 2.13.4 and sbt 1.4.6 From 4c271ffbe75e2b69082296276b19f1862af801f5 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 27 Jan 2021 16:56:52 +0000 Subject: [PATCH 46/79] Update Dockerfile --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index fac7e26..90ab255 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -18,7 +18,7 @@ RUN apk add --update \ openssl \ && rm -rf /var/cache/apk/* -RUN ZULU_ARCH=zulu11.43.55-ca-jdk11.0.9.1-linux_musl_x64.tar.gz && \ +RUN ZULU_ARCH=zulu11.45.27-ca-jdk11.0.10-linux_musl_x64.tar.gz && \ INSTALL_DIR=/usr/lib/jvm && \ BIN_DIR=/usr/bin && \ MAN_DIR=/usr/share/man/man1 && \ From 0be4fcaca137033481196512f7ff9d2ba8db8e11 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 31 Jan 2021 10:34:16 +0000 Subject: [PATCH 47/79] sbt 1.4.7 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 90ab255..00e446e 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.4 -ENV SBT_VERSION 1.4.6 +ENV SBT_VERSION 1.4.7 RUN apk add --update \ python3 \ From 47fbeba5cd56aea98f8717452b9f8579ca4f0e6d Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 31 Jan 2021 10:34:40 +0000 Subject: [PATCH 48/79] Update README.md --- docker_base_zulujdk_11_sbt/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index e326a11..7b79acb 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.9, scala 2.13.4 and sbt 1.4.6 +zulu openjdk 11.0.10, scala 2.13.4 and sbt 1.4.7 From 231a52704edb2a7e845b1a0b0d95f24c10838c88 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 23 Feb 2021 10:25:45 +0000 Subject: [PATCH 49/79] scalaVersion 2.13.5 --- docker_base_zulujdk_11_sbt/README.md | 2 +- docker_base_zulujdk_11_sbt/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 7b79acb..8430f26 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.10, scala 2.13.4 and sbt 1.4.7 +zulu openjdk 11.0.10, scala 2.13.5 and sbt 1.4.7 diff --git a/docker_base_zulujdk_11_sbt/build.sbt b/docker_base_zulujdk_11_sbt/build.sbt index 35a1281..e2d7142 100644 --- a/docker_base_zulujdk_11_sbt/build.sbt +++ b/docker_base_zulujdk_11_sbt/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.4" +scalaVersion := "2.13.5" From 7041e8c551f5ae95e9abbfc184e6435b1986a379 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 8 Mar 2021 00:36:39 +0000 Subject: [PATCH 50/79] Update README.md --- docker_base_zulujdk_11_sbt/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 8430f26..7052ac5 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.10, scala 2.13.5 and sbt 1.4.7 +zulu openjdk 11.0.10, scala 2.13.5 and sbt 1.4.8 From f1bd52d3dbb186bcbec0edaf39e54a2b64c46930 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 8 Mar 2021 00:37:15 +0000 Subject: [PATCH 51/79] sbt 1.4.8 --- docker_base_zulujdk_11_sbt/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 00e446e..e87443e 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -1,8 +1,8 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.13.4 -ENV SBT_VERSION 1.4.7 +ENV SCALA_VERSION 2.13.5 +ENV SBT_VERSION 1.4.8 RUN apk add --update \ python3 \ From 0c269ec02765f6c006680d52d657167e3a63228f Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 8 Mar 2021 01:23:34 +0000 Subject: [PATCH 52/79] Update Dockerfile --- ember-cli/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ember-cli/Dockerfile b/ember-cli/Dockerfile index 5b6ac52..62c15da 100644 --- a/ember-cli/Dockerfile +++ b/ember-cli/Dockerfile @@ -11,7 +11,7 @@ CMD ["ember", "server"] # Install watchman build dependencies RUN \ apt-get update -y &&\ - apt-get install -y python-dev + apt-get install -y python-dev python-pip # install watchman # Note: See the README.md to find out how to increase the @@ -28,7 +28,7 @@ RUN \ # Install ember dev dependencies RUN \ - npm install -g bower@1.8.0 \ + npm install -g bower@1.8.8 \ npm i -g npm # install official phantomjs binaries @@ -70,8 +70,5 @@ RUN \ apt-get install -y \ jq -RUN \ - curl https://bootstrap.pypa.io/get-pip.py | python - RUN \ pip install awscli From 47f658d65572f1449edf395855dc953cdff6da41 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 8 Mar 2021 09:05:36 +0000 Subject: [PATCH 53/79] no need to install yarn - already in base image --- ember-cli/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/ember-cli/Dockerfile b/ember-cli/Dockerfile index 62c15da..8fc6b8e 100644 --- a/ember-cli/Dockerfile +++ b/ember-cli/Dockerfile @@ -55,9 +55,6 @@ RUN apt-get update &&\ RUN \ sed -i 's/"$@"/--no-sandbox "$@"/g' /opt/google/chrome/google-chrome -RUN \ - curl -o- -L https://yarnpkg.com/install.sh | bash - # Install ember-cli RUN \ yarn global add ember-cli@3.10.1 From ba23ed4f7a63bb84bad6b793bf2ba08f81aeec89 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 10 Mar 2021 18:35:44 +0000 Subject: [PATCH 54/79] sbt 1.4.9 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index e87443e..9d6ea29 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.5 -ENV SBT_VERSION 1.4.8 +ENV SBT_VERSION 1.4.9 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 7052ac5..af65cbc 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.10, scala 2.13.5 and sbt 1.4.8 +zulu openjdk 11.0.10, scala 2.13.5 and sbt 1.4.9 From cd9d43c47679a2c5879f7acf3eaba3b305d27ad9 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 6 Apr 2021 18:00:20 +0100 Subject: [PATCH 55/79] sbt 1.5.0 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 9d6ea29..aabe240 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.5 -ENV SBT_VERSION 1.4.9 +ENV SBT_VERSION 1.5.0 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index af65cbc..8562cb3 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.10, scala 2.13.5 and sbt 1.4.9 +zulu openjdk 11.0.10, scala 2.13.5 and sbt 1.5.0 From 0195a44cb858c4eeb26ae8c99a7a773b3b4468e4 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 26 Apr 2021 15:42:00 +0100 Subject: [PATCH 56/79] sbt 1.5.1 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index aabe240..1c324a2 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.5 -ENV SBT_VERSION 1.5.0 +ENV SBT_VERSION 1.5.1 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 8562cb3..b3e98b3 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.10, scala 2.13.5 and sbt 1.5.0 +zulu openjdk 11.0.10, scala 2.13.5 and sbt 1.5.1 From 61df74f71b99af16b0aac7fca192fe160a441f82 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 30 Apr 2021 13:37:49 +0100 Subject: [PATCH 57/79] zulu 11.0.11 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 1c324a2..ad1b551 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -18,7 +18,7 @@ RUN apk add --update \ openssl \ && rm -rf /var/cache/apk/* -RUN ZULU_ARCH=zulu11.45.27-ca-jdk11.0.10-linux_musl_x64.tar.gz && \ +RUN ZULU_ARCH=zulu11.48.21-ca-jdk11.0.11-linux_musl_x64.tar.gz && \ INSTALL_DIR=/usr/lib/jvm && \ BIN_DIR=/usr/bin && \ MAN_DIR=/usr/share/man/man1 && \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index b3e98b3..d3dbafd 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.10, scala 2.13.5 and sbt 1.5.1 +zulu openjdk 11.0.11, scala 2.13.5 and sbt 1.5.1 From f1ffa2380eea1970d48de6752d61ab33945b380b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 10 May 2021 20:43:33 +0100 Subject: [PATCH 58/79] sbt 1.5.2 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index ad1b551..745ddf7 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.5 -ENV SBT_VERSION 1.5.1 +ENV SBT_VERSION 1.5.2 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index d3dbafd..d1c0739 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.11, scala 2.13.5 and sbt 1.5.1 +zulu openjdk 11.0.11, scala 2.13.5 and sbt 1.5.2 From 8ab916691ac743f1f5e6c2b9a50c5efea86d1323 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 17 May 2021 12:17:46 +0100 Subject: [PATCH 59/79] scala 2.13.6 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- docker_base_zulujdk_11_sbt/build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 745ddf7..13e1a75 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -1,7 +1,7 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.13.5 +ENV SCALA_VERSION 2.13.6 ENV SBT_VERSION 1.5.2 RUN apk add --update \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index d1c0739..0191296 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.11, scala 2.13.5 and sbt 1.5.2 +zulu openjdk 11.0.11, scala 2.13.6 and sbt 1.5.2 diff --git a/docker_base_zulujdk_11_sbt/build.sbt b/docker_base_zulujdk_11_sbt/build.sbt index e2d7142..7d5b75c 100644 --- a/docker_base_zulujdk_11_sbt/build.sbt +++ b/docker_base_zulujdk_11_sbt/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.5" +scalaVersion := "2.13.6" From da5574e6fb414edae81c8ee0cfe7b8b6ffcdea9c Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 3 Jun 2021 21:31:28 +0100 Subject: [PATCH 60/79] sbt 1.5.3 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 13e1a75..bfbce87 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.6 -ENV SBT_VERSION 1.5.2 +ENV SBT_VERSION 1.5.3 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 0191296..305536a 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.11, scala 2.13.6 and sbt 1.5.2 +zulu openjdk 11.0.11, scala 2.13.6 and sbt 1.5.3 From 6f5de9b2ec3dd10b9ca24ef18409b8f4983c334c Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 14 Jun 2021 09:37:13 +0100 Subject: [PATCH 61/79] sbt 1.5.4 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- docker_base_zulujdk_11_sbt/project/build.properties | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 docker_base_zulujdk_11_sbt/project/build.properties diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index bfbce87..afab1da 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.6 -ENV SBT_VERSION 1.5.3 +ENV SBT_VERSION 1.5.4 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 305536a..046a040 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.11, scala 2.13.6 and sbt 1.5.3 +zulu openjdk 11.0.11, scala 2.13.6 and sbt 1.5.4 diff --git a/docker_base_zulujdk_11_sbt/project/build.properties b/docker_base_zulujdk_11_sbt/project/build.properties new file mode 100644 index 0000000..14095e1 --- /dev/null +++ b/docker_base_zulujdk_11_sbt/project/build.properties @@ -0,0 +1,2 @@ +sbt.version=1.5.4 + From 0506c710fa18b58204bbe3f71a103437f614c985 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 12 Jul 2021 13:20:29 +0100 Subject: [PATCH 62/79] sbt 1.5.5 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index afab1da..97b5155 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.6 -ENV SBT_VERSION 1.5.4 +ENV SBT_VERSION 1.5.5 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 046a040..e0af71b 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.11, scala 2.13.6 and sbt 1.5.4 +zulu openjdk 11.0.11, scala 2.13.6 and sbt 1.5.5 From 3baa543ab0ed5209021b2c875eaba038c9eab845 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 28 Jul 2021 01:08:07 +0100 Subject: [PATCH 63/79] jdk11.0.12 --- docker_base_zulujdk_11_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_sbt/README.md | 2 +- docker_base_zulujdk_11_sbt/project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 97b5155..e973bbd 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -18,7 +18,7 @@ RUN apk add --update \ openssl \ && rm -rf /var/cache/apk/* -RUN ZULU_ARCH=zulu11.48.21-ca-jdk11.0.11-linux_musl_x64.tar.gz && \ +RUN ZULU_ARCH=zulu11.50.19-ca-jdk11.0.12-linux_musl_x64.tar.gz && \ INSTALL_DIR=/usr/lib/jvm && \ BIN_DIR=/usr/bin && \ MAN_DIR=/usr/share/man/man1 && \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index e0af71b..29d4309 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,3 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.11, scala 2.13.6 and sbt 1.5.5 +zulu openjdk 11.0.12, scala 2.13.6 and sbt 1.5.5 diff --git a/docker_base_zulujdk_11_sbt/project/build.properties b/docker_base_zulujdk_11_sbt/project/build.properties index 14095e1..1188d5f 100644 --- a/docker_base_zulujdk_11_sbt/project/build.properties +++ b/docker_base_zulujdk_11_sbt/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.5.4 +sbt.version=1.5.5 From e62f3e27311905d4ed8b55735d7cffa395e35b19 Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Fri, 5 Nov 2021 18:13:41 +0100 Subject: [PATCH 64/79] scala 2.13.7 and protoc --- .gitignore | 1 + README.md | 10 +++++++--- docker_base_zulujdk_11_sbt/Dockerfile | 3 ++- docker_base_zulujdk_11_sbt/README.md | 9 ++++++++- docker_base_zulujdk_11_sbt/build.sbt | 2 +- 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..62c8935 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ \ No newline at end of file diff --git a/README.md b/README.md index 5fc35c3..92686b9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ # Docker snippets. -Just a bunch of docker file I needed over time. +Just a bunch of docker file we needed over time. + +## docker_base_zulujdk_11_sbt + +At the moment the base image is using Alpine Linux and Azul JDK and precisely zulu11.50.19 JDK 11.0.12 also described here https://docs.azul.com/core/zulu-openjdk/release-notes/october-2021 + +The full list of images available can be seen here https://cdn.azul.com/zulu/bin/ and we are using https://cdn.azul.com/zulu/bin/zulu11.50.19-ca-jdk11.0.12-linux_musl_x64.tar.gz ## docker_base_openjdk_8_sbt @@ -14,5 +20,3 @@ Ruby 2.3 that needed docker:latest as base ## docker_mongodb_2 Mongodb 2.6 image - - diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index e973bbd..3c3d865 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -1,7 +1,7 @@ FROM docker:latest ENV LANG C.UTF-8 -ENV SCALA_VERSION 2.13.6 +ENV SCALA_VERSION 2.13.7 ENV SBT_VERSION 1.5.5 RUN apk add --update \ @@ -16,6 +16,7 @@ RUN apk add --update \ bash \ jq \ openssl \ + protoc \ && rm -rf /var/cache/apk/* RUN ZULU_ARCH=zulu11.50.19-ca-jdk11.0.12-linux_musl_x64.tar.gz && \ diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md index 29d4309..6385281 100644 --- a/docker_base_zulujdk_11_sbt/README.md +++ b/docker_base_zulujdk_11_sbt/README.md @@ -1,3 +1,10 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.12, scala 2.13.6 and sbt 1.5.5 +zulu openjdk 11.0.12, scala 2.13.7 and sbt 1.5.5 + +## Build and run the image + +``` +docker build -t "docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.5" . +docker run --entrypoint sh -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.5 +``` diff --git a/docker_base_zulujdk_11_sbt/build.sbt b/docker_base_zulujdk_11_sbt/build.sbt index 7d5b75c..19a8f52 100644 --- a/docker_base_zulujdk_11_sbt/build.sbt +++ b/docker_base_zulujdk_11_sbt/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.6" +scalaVersion := "2.13.7" From 124ed315db7fca97d654e8b4db27ce32373ce5cf Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Fri, 5 Nov 2021 19:00:45 +0100 Subject: [PATCH 65/79] fix protoc compilation --- docker_base_zulujdk_11_sbt/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_sbt/Dockerfile index 3c3d865..14dafe9 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_sbt/Dockerfile @@ -16,6 +16,7 @@ RUN apk add --update \ bash \ jq \ openssl \ + libc6-compat \ protoc \ && rm -rf /var/cache/apk/* From c5b50cee51fbad466c5a205909fad9d46478e53d Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Tue, 14 Dec 2021 18:27:24 +0100 Subject: [PATCH 66/79] Update to sbt v1.5.6 --- .gitignore | 2 +- .../Dockerfile | 4 +- docker_base_zulujdk_11_0_12_sbt/README.md | 45 +++++++++++++++++++ .../build.sbt | 0 .../project/build.properties | 2 + docker_base_zulujdk_11_sbt/README.md | 10 ----- .../project/build.properties | 2 - 7 files changed, 51 insertions(+), 14 deletions(-) rename {docker_base_zulujdk_11_sbt => docker_base_zulujdk_11_0_12_sbt}/Dockerfile (94%) create mode 100644 docker_base_zulujdk_11_0_12_sbt/README.md rename {docker_base_zulujdk_11_sbt => docker_base_zulujdk_11_0_12_sbt}/build.sbt (100%) create mode 100644 docker_base_zulujdk_11_0_12_sbt/project/build.properties delete mode 100644 docker_base_zulujdk_11_sbt/README.md delete mode 100644 docker_base_zulujdk_11_sbt/project/build.properties diff --git a/.gitignore b/.gitignore index 62c8935..bc8a670 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.idea/ \ No newline at end of file +.idea/* \ No newline at end of file diff --git a/docker_base_zulujdk_11_sbt/Dockerfile b/docker_base_zulujdk_11_0_12_sbt/Dockerfile similarity index 94% rename from docker_base_zulujdk_11_sbt/Dockerfile rename to docker_base_zulujdk_11_0_12_sbt/Dockerfile index 14dafe9..87a47c8 100644 --- a/docker_base_zulujdk_11_sbt/Dockerfile +++ b/docker_base_zulujdk_11_0_12_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.7 -ENV SBT_VERSION 1.5.5 +ENV SBT_VERSION 1.5.6 RUN apk add --update \ python3 \ @@ -17,6 +17,7 @@ RUN apk add --update \ jq \ openssl \ libc6-compat \ + gcompat \ protoc \ && rm -rf /var/cache/apk/* @@ -48,4 +49,5 @@ RUN \ echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc COPY build.sbt . +#ADD schedule-grpc.tar.gz /root/sailing_schedule RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt diff --git a/docker_base_zulujdk_11_0_12_sbt/README.md b/docker_base_zulujdk_11_0_12_sbt/README.md new file mode 100644 index 0000000..7fbd63f --- /dev/null +++ b/docker_base_zulujdk_11_0_12_sbt/README.md @@ -0,0 +1,45 @@ +# docker_base_zulujdk_11_sbt + +zulu openjdk 11.0.12, scala 2.13.7 and sbt 1.5.6 + +## Versions + +``` +bash-5.1# java -version +openjdk version "11.0.12" 2021-07-20 LTS +OpenJDK Runtime Environment Zulu11.50+19-CA (build 11.0.12+7-LTS) +OpenJDK 64-Bit Server VM Zulu11.50+19-CA (build 11.0.12+7-LTS, mixed mode) +bash-5.1# protoc --version +libprotoc 3.15.7 +``` + +## Build and run the image + +``` +docker build -t "docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6" . +docker run --entrypoint sh -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6 +``` + +## Test the image locally against an actual sbt project +At first you have to export you current sbt project that you want to test within this Docker image: + +``` +git archive "" | gzip > your_project.tar.gz +``` + +Copy the tarball into this folder and use the Docker [ADD command] + +``` +COPY build.sbt . +// Add the project into your container: +ADD your_project.tar.gz /root/your_project +RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt +``` + +Run the container and then compile the project + +``` +docker run --entrypoint bash -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6 +``` + + diff --git a/docker_base_zulujdk_11_sbt/build.sbt b/docker_base_zulujdk_11_0_12_sbt/build.sbt similarity index 100% rename from docker_base_zulujdk_11_sbt/build.sbt rename to docker_base_zulujdk_11_0_12_sbt/build.sbt diff --git a/docker_base_zulujdk_11_0_12_sbt/project/build.properties b/docker_base_zulujdk_11_0_12_sbt/project/build.properties new file mode 100644 index 0000000..71aac7f --- /dev/null +++ b/docker_base_zulujdk_11_0_12_sbt/project/build.properties @@ -0,0 +1,2 @@ +sbt.version=1.5.6 + diff --git a/docker_base_zulujdk_11_sbt/README.md b/docker_base_zulujdk_11_sbt/README.md deleted file mode 100644 index 6385281..0000000 --- a/docker_base_zulujdk_11_sbt/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# docker_base_zulujdk_11_sbt - -zulu openjdk 11.0.12, scala 2.13.7 and sbt 1.5.5 - -## Build and run the image - -``` -docker build -t "docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.5" . -docker run --entrypoint sh -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.5 -``` diff --git a/docker_base_zulujdk_11_sbt/project/build.properties b/docker_base_zulujdk_11_sbt/project/build.properties deleted file mode 100644 index 1188d5f..0000000 --- a/docker_base_zulujdk_11_sbt/project/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -sbt.version=1.5.5 - From 66834664156b4eca7e25cdc7cc75c3f12cbe85a7 Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Wed, 29 Dec 2021 12:12:35 +0100 Subject: [PATCH 67/79] upgrade sbt --- docker_base_zulujdk_11_0_12_sbt/Dockerfile | 2 +- docker_base_zulujdk_11_0_12_sbt/README.md | 8 ++++---- docker_base_zulujdk_11_0_12_sbt/project/build.properties | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker_base_zulujdk_11_0_12_sbt/Dockerfile b/docker_base_zulujdk_11_0_12_sbt/Dockerfile index 87a47c8..05c2329 100644 --- a/docker_base_zulujdk_11_0_12_sbt/Dockerfile +++ b/docker_base_zulujdk_11_0_12_sbt/Dockerfile @@ -2,7 +2,7 @@ FROM docker:latest ENV LANG C.UTF-8 ENV SCALA_VERSION 2.13.7 -ENV SBT_VERSION 1.5.6 +ENV SBT_VERSION 1.6.1 RUN apk add --update \ python3 \ diff --git a/docker_base_zulujdk_11_0_12_sbt/README.md b/docker_base_zulujdk_11_0_12_sbt/README.md index 7fbd63f..a9a01c0 100644 --- a/docker_base_zulujdk_11_0_12_sbt/README.md +++ b/docker_base_zulujdk_11_0_12_sbt/README.md @@ -1,6 +1,6 @@ # docker_base_zulujdk_11_sbt -zulu openjdk 11.0.12, scala 2.13.7 and sbt 1.5.6 +zulu openjdk 11.0.12, scala 2.13.7 and sbt 1.6.1 ## Versions @@ -16,8 +16,8 @@ libprotoc 3.15.7 ## Build and run the image ``` -docker build -t "docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6" . -docker run --entrypoint sh -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6 +docker build -t "docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.6.1" . +docker run --entrypoint sh -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.6.1 ``` ## Test the image locally against an actual sbt project @@ -39,7 +39,7 @@ RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt Run the container and then compile the project ``` -docker run --entrypoint bash -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6 +docker run --entrypoint bash -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.6.1 ``` diff --git a/docker_base_zulujdk_11_0_12_sbt/project/build.properties b/docker_base_zulujdk_11_0_12_sbt/project/build.properties index 71aac7f..13ecfea 100644 --- a/docker_base_zulujdk_11_0_12_sbt/project/build.properties +++ b/docker_base_zulujdk_11_0_12_sbt/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.5.6 +sbt.version=1.6.1 From 26c854f1f682c1cfdf68e1af7dabeb315187b3d5 Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Wed, 12 Jan 2022 13:27:59 +0100 Subject: [PATCH 68/79] chore: ignore idea files --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bc8a670..47a196e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea/* \ No newline at end of file +.idea/* +/.idea \ No newline at end of file From 3ed546eda8d5043d08ae5f7a01bd0ed9453a869b Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Wed, 12 Jan 2022 13:42:00 +0100 Subject: [PATCH 69/79] creating a new base image --- zulu_openjdk_11/Dockerfile | 0 zulu_openjdk_11/README.md | 45 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 zulu_openjdk_11/Dockerfile create mode 100644 zulu_openjdk_11/README.md diff --git a/zulu_openjdk_11/Dockerfile b/zulu_openjdk_11/Dockerfile new file mode 100644 index 0000000..e69de29 diff --git a/zulu_openjdk_11/README.md b/zulu_openjdk_11/README.md new file mode 100644 index 0000000..ad8e16f --- /dev/null +++ b/zulu_openjdk_11/README.md @@ -0,0 +1,45 @@ +# docker_base_zulujdk_11_sbt + +zulu openjdk 11-latest, scala 2.13.8 and sbt 1.6.1 + +## Versions + +``` +bash-5.1# java -version +openjdk version "11.0.12" 2021-07-20 LTS +OpenJDK Runtime Environment Zulu11.50+19-CA (build 11.0.12+7-LTS) +OpenJDK 64-Bit Server VM Zulu11.50+19-CA (build 11.0.12+7-LTS, mixed mode) +bash-5.1# protoc --version +libprotoc 3.15.7 +``` + +## Build and run the image + +``` +docker build -t "zulu_openjdk_11:jdk11.0.12_sbt1.6.1" . +docker run --entrypoint sh -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6 +``` + +## Test the image locally against an actual sbt project +At first you have to export you current sbt project that you want to test within this Docker image: + +``` +git archive "" | gzip > your_project.tar.gz +``` + +Copy the tarball into this folder and use the Docker [ADD command] + +``` +COPY build.sbt . +// Add the project into your container: +ADD your_project.tar.gz /root/your_project +RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt +``` + +Run the container and then compile the project + +``` +docker run --entrypoint bash -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6 +``` + + From df64c77efbfd23663be89e1d5f5b43e74442e98a Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Wed, 12 Jan 2022 16:25:57 +0100 Subject: [PATCH 70/79] Zulu JDK 11+ * OpenJDK 11.0.13 * Ubuntu Focal Fossa * Protobuf, pip, openssl, jd and awscli * Scala 2.13.7 * sbt 1.6.1 --- zulu_openjdk_11/Dockerfile | 36 ++++++++++++++++++++++++++++++++++++ zulu_openjdk_11/README.md | 14 ++++++-------- zulu_openjdk_11/build.sbt | 1 + 3 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 zulu_openjdk_11/build.sbt diff --git a/zulu_openjdk_11/Dockerfile b/zulu_openjdk_11/Dockerfile index e69de29..1c4cace 100644 --- a/zulu_openjdk_11/Dockerfile +++ b/zulu_openjdk_11/Dockerfile @@ -0,0 +1,36 @@ +FROM azul/zulu-openjdk:11 + +ENV SCALA_VERSION 2.13.7 +ENV SBT_VERSION 1.6.1 + +WORKDIR /root + +#SHELL ["/bin/bash", "-c"] + +RUN \ + apt-get -qq update && \ + apt-get install -yqq \ + wget \ + protobuf-compiler \ + python3 \ + python3-pip \ + jq \ + postgresql-client \ + openssl + +RUN \ + pip install awscli && \ + wget "https://downloads.typesafe.com/scala/${SCALA_VERSION}/scala-${SCALA_VERSION}.tgz" && \ + tar -zxf "scala-${SCALA_VERSION}.tgz" && \ + echo >> /root/.bashrc && \ + echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc + +RUN \ + wget https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ + tar -zxf sbt-$SBT_VERSION.tgz && \ + echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc + +COPY build.sbt . +#ADD trip.tar.gz /root/trip +#ADD env.sh /root/env.sh +RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt diff --git a/zulu_openjdk_11/README.md b/zulu_openjdk_11/README.md index ad8e16f..10b2eec 100644 --- a/zulu_openjdk_11/README.md +++ b/zulu_openjdk_11/README.md @@ -1,4 +1,4 @@ -# docker_base_zulujdk_11_sbt +# Zulu Openjdk 11-latest (Ubuntu) zulu openjdk 11-latest, scala 2.13.8 and sbt 1.6.1 @@ -6,18 +6,16 @@ zulu openjdk 11-latest, scala 2.13.8 and sbt 1.6.1 ``` bash-5.1# java -version -openjdk version "11.0.12" 2021-07-20 LTS -OpenJDK Runtime Environment Zulu11.50+19-CA (build 11.0.12+7-LTS) -OpenJDK 64-Bit Server VM Zulu11.50+19-CA (build 11.0.12+7-LTS, mixed mode) -bash-5.1# protoc --version -libprotoc 3.15.7 +openjdk version "11.0.13" 2021-10-19 LTS +OpenJDK Runtime Environment Zulu11.52+13-CA (build 11.0.13+8-LTS) +OpenJDK 64-Bit Server VM Zulu11.52+13-CA (build 11.0.13+8-LTS, mixed mode) ``` ## Build and run the image ``` -docker build -t "zulu_openjdk_11:jdk11.0.12_sbt1.6.1" . -docker run --entrypoint sh -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6 +docker build -t "zulu_openjdk:jdk11_sbt161" . +docker run --entrypoint /bin/bash -it zulu_openjdk:jdk11_sbt161 ``` ## Test the image locally against an actual sbt project diff --git a/zulu_openjdk_11/build.sbt b/zulu_openjdk_11/build.sbt new file mode 100644 index 0000000..53034c3 --- /dev/null +++ b/zulu_openjdk_11/build.sbt @@ -0,0 +1 @@ +scalaVersion := "2.13.8" From 3531da22c4b675d82d46a15e2d248bcf4757d78f Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Wed, 12 Jan 2022 16:29:31 +0100 Subject: [PATCH 71/79] chore: 2.13.7 --- zulu_openjdk_11/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zulu_openjdk_11/build.sbt b/zulu_openjdk_11/build.sbt index 53034c3..13b9954 100644 --- a/zulu_openjdk_11/build.sbt +++ b/zulu_openjdk_11/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.8" +scalaVersion := "2.13.7" From 95f47278801ffa02cec25e15d22ddf541b11c014 Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Wed, 12 Jan 2022 16:49:44 +0100 Subject: [PATCH 72/79] Add curl --- zulu_openjdk_11/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/zulu_openjdk_11/Dockerfile b/zulu_openjdk_11/Dockerfile index 1c4cace..a8a7123 100644 --- a/zulu_openjdk_11/Dockerfile +++ b/zulu_openjdk_11/Dockerfile @@ -11,6 +11,7 @@ RUN \ apt-get -qq update && \ apt-get install -yqq \ wget \ + curl \ protobuf-compiler \ python3 \ python3-pip \ From 723b8bec614d3bdea208e5cfba4d9cd0127b0de3 Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Wed, 12 Jan 2022 17:02:06 +0100 Subject: [PATCH 73/79] chore: add curl --- zulu_openjdk_11/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zulu_openjdk_11/Dockerfile b/zulu_openjdk_11/Dockerfile index a8a7123..dda61b9 100644 --- a/zulu_openjdk_11/Dockerfile +++ b/zulu_openjdk_11/Dockerfile @@ -23,12 +23,14 @@ RUN \ pip install awscli && \ wget "https://downloads.typesafe.com/scala/${SCALA_VERSION}/scala-${SCALA_VERSION}.tgz" && \ tar -zxf "scala-${SCALA_VERSION}.tgz" && \ + rm scala-${SCALA_VERSION}.tgz && \ echo >> /root/.bashrc && \ echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc RUN \ wget https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ tar -zxf sbt-$SBT_VERSION.tgz && \ + rm sbt-$SBT_VERSION.tgz && \ echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc COPY build.sbt . From 4183d38dd5cd7b87ff75fbc9914974b72e78b10a Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Wed, 12 Jan 2022 20:17:59 +0100 Subject: [PATCH 74/79] Zulu ubuntu openjdk 11 (#1) * chore: ignore idea files * creating a new base image * Zulu JDK 11+ * OpenJDK 11.0.13 * Ubuntu Focal Fossa * Protobuf, pip, openssl, jd and awscli * Scala 2.13.7 * sbt 1.6.1 * chore: 2.13.7 * Add curl * chore: add curl Co-authored-by: Alfredo Torre --- .gitignore | 3 ++- zulu_openjdk_11/Dockerfile | 39 ++++++++++++++++++++++++++++++++++ zulu_openjdk_11/README.md | 43 ++++++++++++++++++++++++++++++++++++++ zulu_openjdk_11/build.sbt | 1 + 4 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 zulu_openjdk_11/Dockerfile create mode 100644 zulu_openjdk_11/README.md create mode 100644 zulu_openjdk_11/build.sbt diff --git a/.gitignore b/.gitignore index bc8a670..47a196e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea/* \ No newline at end of file +.idea/* +/.idea \ No newline at end of file diff --git a/zulu_openjdk_11/Dockerfile b/zulu_openjdk_11/Dockerfile new file mode 100644 index 0000000..dda61b9 --- /dev/null +++ b/zulu_openjdk_11/Dockerfile @@ -0,0 +1,39 @@ +FROM azul/zulu-openjdk:11 + +ENV SCALA_VERSION 2.13.7 +ENV SBT_VERSION 1.6.1 + +WORKDIR /root + +#SHELL ["/bin/bash", "-c"] + +RUN \ + apt-get -qq update && \ + apt-get install -yqq \ + wget \ + curl \ + protobuf-compiler \ + python3 \ + python3-pip \ + jq \ + postgresql-client \ + openssl + +RUN \ + pip install awscli && \ + wget "https://downloads.typesafe.com/scala/${SCALA_VERSION}/scala-${SCALA_VERSION}.tgz" && \ + tar -zxf "scala-${SCALA_VERSION}.tgz" && \ + rm scala-${SCALA_VERSION}.tgz && \ + echo >> /root/.bashrc && \ + echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc + +RUN \ + wget https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ + tar -zxf sbt-$SBT_VERSION.tgz && \ + rm sbt-$SBT_VERSION.tgz && \ + echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc + +COPY build.sbt . +#ADD trip.tar.gz /root/trip +#ADD env.sh /root/env.sh +RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt diff --git a/zulu_openjdk_11/README.md b/zulu_openjdk_11/README.md new file mode 100644 index 0000000..10b2eec --- /dev/null +++ b/zulu_openjdk_11/README.md @@ -0,0 +1,43 @@ +# Zulu Openjdk 11-latest (Ubuntu) + +zulu openjdk 11-latest, scala 2.13.8 and sbt 1.6.1 + +## Versions + +``` +bash-5.1# java -version +openjdk version "11.0.13" 2021-10-19 LTS +OpenJDK Runtime Environment Zulu11.52+13-CA (build 11.0.13+8-LTS) +OpenJDK 64-Bit Server VM Zulu11.52+13-CA (build 11.0.13+8-LTS, mixed mode) +``` + +## Build and run the image + +``` +docker build -t "zulu_openjdk:jdk11_sbt161" . +docker run --entrypoint /bin/bash -it zulu_openjdk:jdk11_sbt161 +``` + +## Test the image locally against an actual sbt project +At first you have to export you current sbt project that you want to test within this Docker image: + +``` +git archive "" | gzip > your_project.tar.gz +``` + +Copy the tarball into this folder and use the Docker [ADD command] + +``` +COPY build.sbt . +// Add the project into your container: +ADD your_project.tar.gz /root/your_project +RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt +``` + +Run the container and then compile the project + +``` +docker run --entrypoint bash -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6 +``` + + diff --git a/zulu_openjdk_11/build.sbt b/zulu_openjdk_11/build.sbt new file mode 100644 index 0000000..13b9954 --- /dev/null +++ b/zulu_openjdk_11/build.sbt @@ -0,0 +1 @@ +scalaVersion := "2.13.7" From 47b41e18e8769c6999687cb4423f7164413a8e87 Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Thu, 13 Jan 2022 16:42:38 +0100 Subject: [PATCH 75/79] bump scala version --- zulu_openjdk_11/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zulu_openjdk_11/Dockerfile b/zulu_openjdk_11/Dockerfile index dda61b9..b5455f3 100644 --- a/zulu_openjdk_11/Dockerfile +++ b/zulu_openjdk_11/Dockerfile @@ -1,6 +1,6 @@ FROM azul/zulu-openjdk:11 -ENV SCALA_VERSION 2.13.7 +ENV SCALA_VERSION 2.13.8 ENV SBT_VERSION 1.6.1 WORKDIR /root From 3b9f02d515ecfa42441e5a947648c846ceccefac Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Mon, 17 Jan 2022 15:48:44 +0100 Subject: [PATCH 76/79] enable docker in containers --- zulu_openjdk_11/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zulu_openjdk_11/Dockerfile b/zulu_openjdk_11/Dockerfile index b5455f3..dd670c7 100644 --- a/zulu_openjdk_11/Dockerfile +++ b/zulu_openjdk_11/Dockerfile @@ -17,7 +17,8 @@ RUN \ python3-pip \ jq \ postgresql-client \ - openssl + openssl \ + docker.io RUN \ pip install awscli && \ From 118418a0bc60530ca1f0e35a4a96c6ba716d1956 Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Tue, 1 Feb 2022 13:12:30 +0100 Subject: [PATCH 77/79] bump Scala v2.13.8 and sbt v1.6.2 --- zulu_openjdk_11/Dockerfile | 2 +- zulu_openjdk_11/README.md | 6 +++--- zulu_openjdk_11/build.sbt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zulu_openjdk_11/Dockerfile b/zulu_openjdk_11/Dockerfile index dd670c7..b1fe406 100644 --- a/zulu_openjdk_11/Dockerfile +++ b/zulu_openjdk_11/Dockerfile @@ -1,7 +1,7 @@ FROM azul/zulu-openjdk:11 ENV SCALA_VERSION 2.13.8 -ENV SBT_VERSION 1.6.1 +ENV SBT_VERSION 1.6.2 WORKDIR /root diff --git a/zulu_openjdk_11/README.md b/zulu_openjdk_11/README.md index 10b2eec..41648a5 100644 --- a/zulu_openjdk_11/README.md +++ b/zulu_openjdk_11/README.md @@ -1,6 +1,6 @@ # Zulu Openjdk 11-latest (Ubuntu) -zulu openjdk 11-latest, scala 2.13.8 and sbt 1.6.1 +zulu openjdk 11-latest, scala 2.13.8 and sbt 1.6.2 ## Versions @@ -14,8 +14,8 @@ OpenJDK 64-Bit Server VM Zulu11.52+13-CA (build 11.0.13+8-LTS, mixed mode) ## Build and run the image ``` -docker build -t "zulu_openjdk:jdk11_sbt161" . -docker run --entrypoint /bin/bash -it zulu_openjdk:jdk11_sbt161 +docker build -t "zulu_openjdk:jdk11_sbt162" . +docker run --entrypoint /bin/bash -it zulu_openjdk:jdk11_sbt162 ``` ## Test the image locally against an actual sbt project diff --git a/zulu_openjdk_11/build.sbt b/zulu_openjdk_11/build.sbt index 13b9954..53034c3 100644 --- a/zulu_openjdk_11/build.sbt +++ b/zulu_openjdk_11/build.sbt @@ -1 +1 @@ -scalaVersion := "2.13.7" +scalaVersion := "2.13.8" From b592958cf8e954eb0ae4c5583b80cb329b47226c Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Fri, 20 May 2022 11:56:51 +0200 Subject: [PATCH 78/79] Target /etc instead of /root --- zulu_openjdk_11/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zulu_openjdk_11/Dockerfile b/zulu_openjdk_11/Dockerfile index b1fe406..5f6579d 100644 --- a/zulu_openjdk_11/Dockerfile +++ b/zulu_openjdk_11/Dockerfile @@ -3,7 +3,7 @@ FROM azul/zulu-openjdk:11 ENV SCALA_VERSION 2.13.8 ENV SBT_VERSION 1.6.2 -WORKDIR /root +WORKDIR /etc #SHELL ["/bin/bash", "-c"] @@ -25,14 +25,14 @@ RUN \ wget "https://downloads.typesafe.com/scala/${SCALA_VERSION}/scala-${SCALA_VERSION}.tgz" && \ tar -zxf "scala-${SCALA_VERSION}.tgz" && \ rm scala-${SCALA_VERSION}.tgz && \ - echo >> /root/.bashrc && \ - echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc + echo >> /etc/bash.bashrc && \ + echo 'export PATH=/etc/scala-$SCALA_VERSION/bin:$PATH' >> /etc/bash.bashrc RUN \ wget https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ tar -zxf sbt-$SBT_VERSION.tgz && \ rm sbt-$SBT_VERSION.tgz && \ - echo >> /root/.bashrc && echo 'export PATH=/root/sbt/bin:$PATH' >> /root/.bashrc + echo >> /etc/bash.bashrc && echo 'export PATH=/etc/sbt/bin:$PATH' >> /etc/bash.bashrc COPY build.sbt . #ADD trip.tar.gz /root/trip From d3663f2142eaba655c7320a751cd4fdf329e9b30 Mon Sep 17 00:00:00 2001 From: Alfredo Torre Date: Tue, 6 Sep 2022 16:09:50 +0200 Subject: [PATCH 79/79] Bump sbt and JDK --- zulu_openjdk_11/Dockerfile | 2 +- zulu_openjdk_11/README.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zulu_openjdk_11/Dockerfile b/zulu_openjdk_11/Dockerfile index 5f6579d..05505b4 100644 --- a/zulu_openjdk_11/Dockerfile +++ b/zulu_openjdk_11/Dockerfile @@ -1,7 +1,7 @@ FROM azul/zulu-openjdk:11 ENV SCALA_VERSION 2.13.8 -ENV SBT_VERSION 1.6.2 +ENV SBT_VERSION 1.7.1 WORKDIR /etc diff --git a/zulu_openjdk_11/README.md b/zulu_openjdk_11/README.md index 41648a5..7fecc16 100644 --- a/zulu_openjdk_11/README.md +++ b/zulu_openjdk_11/README.md @@ -1,21 +1,21 @@ # Zulu Openjdk 11-latest (Ubuntu) -zulu openjdk 11-latest, scala 2.13.8 and sbt 1.6.2 +zulu openjdk 11-latest (11.0.16+), scala 2.13.8 and sbt 1.7.1 ## Versions ``` bash-5.1# java -version -openjdk version "11.0.13" 2021-10-19 LTS -OpenJDK Runtime Environment Zulu11.52+13-CA (build 11.0.13+8-LTS) -OpenJDK 64-Bit Server VM Zulu11.52+13-CA (build 11.0.13+8-LTS, mixed mode) +openjdk version "11.0.16.1" 2022-07-19 LTS +OpenJDK Runtime Environment Zulu11.58+23-CA (build 11.0.16.1+1-LTS) +OpenJDK 64-Bit Server VM Zulu11.58+23-CA (build 11.0.16.1+1-LTS, mixed mode) ``` ## Build and run the image ``` -docker build -t "zulu_openjdk:jdk11_sbt162" . -docker run --entrypoint /bin/bash -it zulu_openjdk:jdk11_sbt162 +docker build -t "zulu_openjdk:jdk11_sbt171" . +docker run --entrypoint /bin/bash -it zulu_openjdk:jdk11_sbt171 ``` ## Test the image locally against an actual sbt project @@ -37,7 +37,7 @@ RUN ./sbt/bin/sbt sbtVersion compile && rm build.sbt Run the container and then compile the project ``` -docker run --entrypoint bash -it docker_base_zulujdk_11_sbt:jdk11.0.12_sbt1.5.6 +docker run --entrypoint bash -it zulu_openjdk:jdk11_sbt171 ```