Skip to content

Commit 6d44b54

Browse files
committed
Go back to custom Dockerfile, but based on Ubuntu and musl-tools
1 parent eec900f commit 6d44b54

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ matrix:
88
include:
99
- os: linux
1010
env: TARGET=x86_64-unknown-linux-musl
11-
DOCKER=alexcrichton/rust-slave-linux-cross:2016-11-11
11+
DOCKER=x86_64-unknown-linux-musl
1212
SKIP_TESTS=1
1313
if: branch != master
1414

Original file line numberDiff line numberDiff line change
@@ -1,29 +1,11 @@
1-
FROM alpine:3.8
1+
FROM ubuntu:16.04
22

3-
RUN apk update && \
4-
apk add \
3+
RUN apt-get update && apt-get install -y \
4+
musl-tools \
55
curl \
66
ca-certificates \
77
perl \
88
make \
9-
gcc \
10-
bash \
11-
musl-dev \
12-
llvm-libunwind-dev \
13-
cmake \
14-
curl-dev \
15-
file \
16-
libffi-dev \
17-
libgit2-dev \
18-
libressl-dev \
19-
libssh2-dev \
20-
llvm5-dev \
21-
llvm5-test-utils \
22-
python2 \
23-
tar \
24-
zlib-dev \
25-
rust \
26-
rust-stdlib \
27-
cargo
9+
gcc
2810

29-
ENV CC_x86_64_unknown_linux_musl=gcc
11+
ENV CC_x86_64_unknown_linux_musl=musl-gcc

0 commit comments

Comments
 (0)