This is an automated email from the ASF dual-hosted git repository.
baunsgaard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/main by this push:
new ab9b25f [SYSTEMDS-2941] Docker images on apache
ab9b25f is described below
commit ab9b25f062789c54ea3a1c99cf9286e94dd0b2f6
Author: baunsgaard <baunsga...@tugraz.at>
AuthorDate: Fri Nov 5 17:05:01 2021 +0100
[SYSTEMDS-2941] Docker images on apache
This commit update all docker images to java 11, and moves the images
to apache. All images are pushed as nightly since the version is slightly
newer than the official release, we can add the official release as an
image if wanted with the same docker building image.
Also changed in this commit is our tests for functional and application
to now run on adoptopenJDK 11.
Closes #1439
---
.github/action/Dockerfile | 2 +-
.github/action/action.yml | 2 +-
docker/build.sh | 6 +++---
docker/push.sh | 6 +++---
docker/pythonsysds.Dockerfile | 21 ++++++++++++++-------
docker/sysds.Dockerfile | 17 +++++++++++++----
docker/testsysds.Dockerfile | 20 ++++++++------------
7 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/.github/action/Dockerfile b/.github/action/Dockerfile
index 7e82474..6996b8d 100644
--- a/.github/action/Dockerfile
+++ b/.github/action/Dockerfile
@@ -19,4 +19,4 @@
#
#-------------------------------------------------------------
-FROM systemds/testingsysds:latest
+FROM apache/systemds:testing-latest
diff --git a/.github/action/action.yml b/.github/action/action.yml
index c65c6a6..57454cf 100644
--- a/.github/action/action.yml
+++ b/.github/action/action.yml
@@ -29,4 +29,4 @@ runs:
using: 'docker'
image: 'Dockerfile'
args:
- - ${{ inputs.test-to-run }}
\ No newline at end of file
+ - ${{ inputs.test-to-run }}
diff --git a/docker/build.sh b/docker/build.sh
index 9655ba0..30eb9af 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -23,13 +23,13 @@
# Build the docker containers
# The first build is for running systemds through docker.
-docker image build -f docker/sysds.Dockerfile -t systemds/sysds:latest .
+docker image build -f docker/sysds.Dockerfile -t apache/systemds:nightly .
# The second build is for testing systemds. This image installs the R
dependencies needed to run the tests.
-docker image build -f docker/testsysds.Dockerfile -t
systemds/testingsysds:latest .
+docker image build -f docker/testsysds.Dockerfile -t
apache/systemds:testing-latest .
# The third build is python docker for systemds.
-docker image build -f docker/pythonsysds.Dockerfile -t
systemds/pythonsysds:latest .
+docker image build -f docker/pythonsysds.Dockerfile -t
apache/systemds:python-nightly .
# You might want to prune the docker system afterwards using
# docker system prune
diff --git a/docker/push.sh b/docker/push.sh
index b669c91..cc00198 100755
--- a/docker/push.sh
+++ b/docker/push.sh
@@ -21,6 +21,6 @@
#-------------------------------------------------------------
-docker push systemds/sysds:latest
-docker push systemds/testingsysds:latest
-docker push systemds/pythonsysds:latest
+docker push apache/systemds:nightly
+docker push apache/systemds:testing-latest
+docker push apache/systemds:python-nightly
diff --git a/docker/pythonsysds.Dockerfile b/docker/pythonsysds.Dockerfile
index bf5e429..c5a5bd8 100644
--- a/docker/pythonsysds.Dockerfile
+++ b/docker/pythonsysds.Dockerfile
@@ -24,11 +24,11 @@ FROM ubuntu:20.04
WORKDIR /usr/src/
# Maven
-ENV MAVEN_VERSION 3.6.3
+ENV MAVEN_VERSION 3.8.3
ENV MAVEN_HOME /usr/lib/mvn
ENV PATH $MAVEN_HOME/bin:$PATH
# Java
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
ENV PATH $JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH
ENV SYSTEMDS_ROOT=/usr/src/systemds
ENV PATH $SYSTEMDS_ROOT/bin:$PATH
@@ -43,8 +43,8 @@ RUN apt-get update -qq \
&& apt-get clean \
&& mkdir -p /usr/lib/jvm \
&& wget -qO- \
-
https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
| tar xzf - \
- && mv jdk8u282-b08 /usr/lib/jvm/java-8-openjdk-amd64 \
+
https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jdk_x64_linux_11.0.13_8.tar.gz
| tar xzf - \
+ && mv openjdk-11.0.13_8 /usr/lib/jvm/java-11-openjdk-amd64 \
&& wget -qO- \
http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz
| tar xzf - \
&& mv apache-maven-$MAVEN_VERSION /usr/lib/mvn \
@@ -60,6 +60,15 @@ RUN apt-get update -qq \
python3 create_python_dist.py && \
pip3 install . && \
cd /usr/src/systemds/ && \
+ rm -r .git && \
+ rm -r .github && \
+ rm -r target/javadoc** && \
+ rm -r target/apidocs** && \
+ rm -r target/classes && \
+ rm -r target/test-classes && \
+ rm -r target/hadoop-test && \
+ rm -r target/maven-archiver && \
+ rm -r target/systemds-** && \
rm -r docker && \
rm -r docs && \
rm -r src && \
@@ -67,9 +76,7 @@ RUN apt-get update -qq \
rm -r CONTRIBUTING.md && \
rm -r pom.xml && \
rm -r ~/.m2 && \
- rm -r .github && \
- rm -r dev && \
- rm -r .git
+ rm -r dev
COPY docker/mountFolder/main.py /input/main.py
diff --git a/docker/sysds.Dockerfile b/docker/sysds.Dockerfile
index ebf5962..c1c71d3 100644
--- a/docker/sysds.Dockerfile
+++ b/docker/sysds.Dockerfile
@@ -24,11 +24,11 @@ FROM ubuntu:20.04
WORKDIR /usr/src/
# Maven
-ENV MAVEN_VERSION 3.6.3
+ENV MAVEN_VERSION 3.8.3
ENV MAVEN_HOME /usr/lib/mvn
ENV PATH $MAVEN_HOME/bin:$PATH
# Java
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
ENV PATH $JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH
ENV SYSTEMDS_ROOT=/usr/src/systemds
ENV PATH $SYSTEMDS_ROOT/bin:$PATH
@@ -43,14 +43,23 @@ RUN apt-get update -qq \
&& apt-get clean \
&& mkdir -p /usr/lib/jvm \
&& wget -qO- \
-
https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
| tar xzf - \
- && mv jdk8u282-b08 /usr/lib/jvm/java-8-openjdk-amd64 \
+
https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jdk_x64_linux_11.0.13_8.tar.gz
| tar xzf - \
+ && mv openjdk-11.0.13_8 /usr/lib/jvm/java-11-openjdk-amd64 \
&& wget -qO- \
http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz
| tar xzf - \
&& mv apache-maven-$MAVEN_VERSION /usr/lib/mvn \
&& git clone --depth 1 https://github.com/apache/systemds.git systemds
&& \
cd /usr/src/systemds/ && \
mvn clean package -P distribution && \
+ rm -r .git && \
+ rm -r .github && \
+ rm -r target/javadoc** && \
+ rm -r target/apidocs** && \
+ rm -r target/classes && \
+ rm -r target/test-classes && \
+ rm -r target/hadoop-test && \
+ rm -r target/maven-archiver && \
+ rm -r target/systemds-** && \
rm -r docker && \
rm -r docs && \
rm -r src && \
diff --git a/docker/testsysds.Dockerfile b/docker/testsysds.Dockerfile
index 5d0ac56..2bfabeb 100644
--- a/docker/testsysds.Dockerfile
+++ b/docker/testsysds.Dockerfile
@@ -26,9 +26,9 @@ FROM ubuntu:20.04
# InstallR Guide: https://cran.r-project.org/
WORKDIR /usr/src/
-ENV MAVEN_VERSION 3.6.3
+ENV MAVEN_VERSION 3.8.3
ENV MAVEN_HOME /usr/lib/mvn
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
ENV PATH $JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
@@ -52,18 +52,14 @@ RUN apt-get update -qq \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys
E298A3A825C0D65DFD57CBB651716619E084DAB9 \
&& add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu
$(lsb_release -cs)-cran40/" \
&& apt-get update -qq \
- && apt-get upgrade -y
-
-# Set language
-RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+ && apt-get upgrade -y \
+ && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.utf8 \
- && /usr/sbin/update-locale LANG=en_US.UTF-8
-
-# Maven and Java
-RUN mkdir -p /usr/lib/jvm \
+ && /usr/sbin/update-locale LANG=en_US.UTF-8 \
+ && mkdir -p /usr/lib/jvm \
&& wget -qO- \
-https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
| tar xzf - \
- && mv jdk8u282-b08 /usr/lib/jvm/java-8-openjdk-amd64 \
+
https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jdk_x64_linux_11.0.13_8.tar.gz
| tar xzf - \
+ && mv openjdk-11.0.13_8 /usr/lib/jvm/java-11-openjdk-amd64 \
&& wget -qO- \
http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz
| tar xzf - \
&& mv apache-maven-$MAVEN_VERSION /usr/lib/mvn
