Skip to content

Commit

Permalink
Fix #430: Use OpenJDK (#431)
Browse files Browse the repository at this point in the history
Change both Dockerfiles (docker and docker_ci) to support OpenJDK 8 instead of Oracle JDK 8.
  • Loading branch information
akwick authored and salsolatragus committed Sep 18, 2019
1 parent 00c066f commit 6af4acd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
4 changes: 3 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM anapsix/alpine-java:8_jdk
FROM openjdk:8-jdk-alpine


LABEL maintainer="[email protected]"

Expand Down Expand Up @@ -31,6 +32,7 @@ RUN apk update \
graphviz \
maven \
subversion \
bash \
\
# Install gradle
&& wget -q https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip \
Expand Down
13 changes: 3 additions & 10 deletions docker/Dockerfile_ci
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ ENV DEBIAN_FRONTEND noninteractive
ENV LANG=C.UTF-8 \
GRADLE_VERSION=4.0.2 \
GRADLE_HOME=/usr/local/gradle
ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
ENV PATH $PATH:$JAVA_HOME/bin

# Setup container environment
RUN apt-get clean \
Expand All @@ -22,13 +20,8 @@ RUN apt-get clean \
&& locale-gen en_US en_US.UTF-8 \
&& dpkg-reconfigure locales \
&& echo "APT::Get::Assume-Yes \"true\";\nAPT::Get::force-yes \"true\";" >> /etc/apt/apt.conf.d/90forceyes \
&& add-apt-repository ppa:webupd8team/java \
&& apt-get update \
&& echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections \
&& apt-get install -y oracle-java8-installer \
&& update-alternatives --set java "$JAVA_HOME/jre/bin/java" \
&& update-alternatives --set javac "$JAVA_HOME/bin/javac" \
&& update-alternatives --set javaws "$JAVA_HOME/jre/bin/javaws" \
&& apt-get install openjdk-8-jdk \
&& apt-get install wget \
&& apt-get clean \
&& apt-get autoclean \
&& apt-get autoremove
Expand Down Expand Up @@ -109,4 +102,4 @@ RUN \
&& mv selenium-server-standalone-3.12.0.jar /usr/local/bin/selenium-server-standalone-3.12.0.jar \
&& ln /usr/lib/chromium-browser/chromedriver /usr/local/bin/chromedriver

WORKDIR /mubench
WORKDIR /mubench

0 comments on commit 6af4acd

Please sign in to comment.