This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/TINKERPOP-2076 by this push:
     new 5d31bed  TINKERPOP-2076 Made docker build compatible with jdk11
5d31bed is described below

commit 5d31bedd057151fd12e61e78d387deee4c25045b
Author: stephen <[email protected]>
AuthorDate: Tue Nov 12 07:35:05 2019 -0500

    TINKERPOP-2076 Made docker build compatible with jdk11
---
 docker/Dockerfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 69c8db7..60d1113a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,30 +15,32 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM ubuntu:trusty
+FROM ubuntu:xenial
 
 LABEL maintainer="Daniel Kuppitz <[email protected]>"
 
 RUN apt-get update
 RUN apt-get -y install software-properties-common python-software-properties 
apt-transport-https curl dpkg
 RUN add-apt-repository ppa:openjdk-r/ppa
-RUN sh -c 'curl -s 
https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb 
-o packages-microsoft-prod.deb'
+RUN sh -c 'curl -s 
https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb 
-o packages-microsoft-prod.deb'
 RUN sh -c 'dpkg -i packages-microsoft-prod.deb'
-RUN sh -c 'echo "deb https://download.mono-project.com/repo/ubuntu 
stable-trusty main" | sudo tee 
/etc/apt/sources.list.d/mono-official-stable.list'
+RUN apt-get install gnupg ca-certificates
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 
3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+RUN sh -c 'echo "deb https://download.mono-project.com/repo/ubuntu 
stable-xenial main"'
+RUN sh -c 'tee /etc/apt/sources.list.d/mono-official-stable.list'
 RUN apt-get update
-RUN apt-get install -y openjdk-8-jdk gawk git maven openssh-server subversion 
zip
+RUN apt-get install -y openjdk-11-jdk gawk git maven openssh-server subversion 
zip
 RUN apt-get install -y --force-yes dotnet-sdk-2.2 python python-dev 
python3-dev python-pip build-essential mono-devel
 RUN pip install virtualenv virtualenvwrapper
 RUN pip install --upgrade pip
-RUN rm -rf /var/lib/apt/lists/* /var/cache/openjdk-8-jdk
+RUN rm -rf /var/lib/apt/lists/* /var/cache/openjdk-11-jdk
 
 RUN sed -i 's@PermitRootLogin without-password@PermitRootLogin yes@' 
/etc/ssh/sshd_config
 RUN sed -i 's@session\s*required\s*pam_loginuid.so@session optional 
pam_loginuuid.so@g' /etc/pam.d/sshd
 RUN ssh-keygen -t rsa -f ~/.ssh/id_rsa -N '' \
     && cat ~/.ssh/id_rsa.pub > ~/.ssh/authorized_keys
 
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 
 RUN sed -i 's/.*"$PS1".*/# \0/' ~/.bashrc
 RUN echo "export JAVA_HOME=${JAVA_HOME}" >> ~/.bashrc

Reply via email to