Skip to content

Commit 65c02b7

Browse files
committed
Use openjdk instead of oracle java, fix travis build
1 parent 3ef651d commit 65c02b7

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ install:
3232
- pip install .
3333

3434
script:
35-
- tox -e `if [ "$TRAVIS_PYTHON_VERSION" == "pypy2.7-6.0" ]; then echo pypy; else echo py${TRAVIS_PYTHON_VERSION/./}; fi`
35+
- tox -i https://pypi.python.org/simple -e `if [ "$TRAVIS_PYTHON_VERSION" == "pypy2.7-6.0" ]; then echo pypy; else echo py${TRAVIS_PYTHON_VERSION/./}; fi`
3636

3737
after_success:
3838
- coveralls

Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
FROM ubuntu:xenial
22
ENV DEBIAN_FRONTEND=noninteractive
33

4-
RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu precise main" >> /etc/apt/sources.list
54
RUN echo "deb http://ppa.launchpad.net/fkrull/deadsnakes/ubuntu precise main" >> /etc/apt/sources.list
6-
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5BB92C09DB82666C C2518248EEA14886
7-
RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
5+
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5BB92C09DB82666C
86
RUN apt-get update && apt-get install -y python2.7-dev \
97
python3.5-dev \
108
python-pkg-resources \
119
python-setuptools \
1210
python-virtualenv \
1311
libsnappy-dev \
14-
oracle-java8-installer \
12+
locales \
13+
openjdk-8-jdk \
1514
wget\
1615
g++ \
1716
ca-certificates \
@@ -25,7 +24,7 @@ RUN ln -s $PWD/pypy2-v5.8.0-linux64/bin/pypy /usr/local/bin/pypy
2524

2625
RUN /usr/sbin/locale-gen en_US.UTF-8
2726
ENV LANG en_US.UTF-8
28-
ENV JAVA_HOME="/usr/lib/jvm/java-8-oracle"
27+
ENV JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk-amd64"
2928
ENV PATH="$PATH:$JAVA_HOME/bin"
3029

3130
COPY servers /work/servers

0 commit comments

Comments
 (0)