Skip to content

Commit 7593a60

Browse files
saschanazkripken
authored andcommitted
Less dependency installations on Travis (emscripten-core#5681)
1 parent a024473 commit 7593a60

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
# For travis
2-
FROM ubuntu:16.04
2+
FROM buildpack-deps:xenial
33
SHELL ["/bin/bash", "-c"]
44
ENV DEBIAN_FRONTEND noninteractive
55
RUN mkdir -p /root/emscripten/
66
COPY . /root/emscripten/
77

88
RUN cd /root/ \
99
&& apt-get update \
10-
&& apt-get install -y python python-pip wget git cmake build-essential software-properties-common \
10+
&& apt-get install -y python python-pip cmake build-essential openjdk-9-jre-headless \
1111
&& pip install --upgrade pip \
1212
&& pip install lit \
13-
&& add-apt-repository ppa:webupd8team/java \
14-
&& apt-get update \
15-
&& echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections \
16-
&& echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections \
17-
&& apt-get install -y oracle-java9-installer \
1813
&& wget https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz \
1914
&& tar -xf emsdk-portable.tar.gz \
2015
&& pushd emsdk-portable \

0 commit comments

Comments
 (0)