Skip to content

Commit 4b86816

Browse files
committed
Update docker builds to use Ubuntu 18.04
1 parent 5323f41 commit 4b86816

File tree

3 files changed

+16
-24
lines changed

3 files changed

+16
-24
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ script:
99

1010
matrix:
1111
include:
12-
- env: TEST_ENV=ubuntu-16.04-llvm-dev
13-
- env: TEST_ENV=ubuntu-16.04-llvm-6.0
14-
- env: TEST_ENV=ubuntu-16.04-llvm-5.0
12+
- env: TEST_ENV=ubuntu-18.04-llvm-dev
13+
- env: TEST_ENV=ubuntu-18.04-llvm-6.0
14+
- env: TEST_ENV=ubuntu-18.04-llvm-5.0

Dockerfile

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
1-
ARG UBUNTU_VERSION=16.04
1+
ARG UBUNTU_VERSION=18.04
22
FROM ubuntu:$UBUNTU_VERSION
33

44
RUN set -x \
55
&& apt update \
6-
&& apt install -y apt-transport-https \
6+
&& apt install -y apt-transport-https gnupg2 ca-certificates \
77
&& echo "deb https://dl.bintray.com/sbt/debian /" > /etc/apt/sources.list.d/sbt.list \
88
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823 \
99
&& apt update \
10-
&& apt install -y curl build-essential openjdk-8-jdk-headless sbt \
10+
&& apt install -y curl build-essential openjdk-8-jdk-headless sbt cmake make \
1111
&& rm -rf /var/lib/apt/lists/*
1212

13-
WORKDIR /cmake
14-
ARG CMAKE_ARCHIVE=cmake-3.11.2-Linux-x86_64
15-
RUN curl https://cmake.org/files/v3.11/$CMAKE_ARCHIVE.tar.gz | tar zxf - \
16-
&& for i in bin share; do \
17-
cp -r /cmake/$CMAKE_ARCHIVE/$i/* /usr/$i/; \
18-
done \
19-
&& rm -rf /cmake
20-
2113
ARG LLVM_VERSION=6.0
2214
# LLVM dev versions do not have a "-x.y" version suffix.
2315
ARG LLVM_DEB_COMPONENT=-$LLVM_VERSION
@@ -26,7 +18,7 @@ RUN set -x \
2618
&& . /etc/lsb-release \
2719
&& echo "deb https://apt.llvm.org/$DISTRIB_CODENAME/ llvm-toolchain-$DISTRIB_CODENAME$LLVM_DEB_COMPONENT main" > /etc/apt/sources.list.d/llvm.list \
2820
&& apt update \
29-
&& apt install -y clang-$LLVM_VERSION libclang-$LLVM_VERSION-dev make \
21+
&& apt install -y clang-$LLVM_VERSION libclang-$LLVM_VERSION-dev \
3022
&& rm -rf /var/lib/apt/lists/*
3123

3224
WORKDIR /src/target

docker-compose.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
version: '3'
22

33
services:
4-
ubuntu-16.04-llvm-dev:
5-
image: scala-native-bindgen:ubuntu-16.04-llvm-dev
4+
ubuntu-18.04-llvm-dev:
5+
image: scala-native-bindgen:ubuntu-18.04-llvm-dev
66
build:
77
context: .
88
args:
9-
- UBUNTU_VERSION=16.04
9+
- UBUNTU_VERSION=18.04
1010
- LLVM_VERSION=7
1111
- LLVM_DEB_COMPONENT=
1212

13-
ubuntu-16.04-llvm-6.0:
14-
image: scala-native-bindgen:ubuntu-16.04-llvm-6.0
13+
ubuntu-18.04-llvm-6.0:
14+
image: scala-native-bindgen:ubuntu-18.04-llvm-6.0
1515
build:
1616
context: .
1717
args:
18-
- UBUNTU_VERSION=16.04
18+
- UBUNTU_VERSION=18.04
1919
- LLVM_VERSION=6.0
2020

21-
ubuntu-16.04-llvm-5.0:
22-
image: scala-native-bindgen:ubuntu-16.04-llvm-5.0
21+
ubuntu-18.04-llvm-5.0:
22+
image: scala-native-bindgen:ubuntu-18.04-llvm-5.0
2323
build:
2424
context: .
2525
args:
26-
- UBUNTU_VERSION=16.04
26+
- UBUNTU_VERSION=18.04
2727
- LLVM_VERSION=5.0
2828

2929
sbt-test:

0 commit comments

Comments
 (0)