From de64c8981c5bae3d2a5adc9a0c237c0b42f2e2f2 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Tue, 18 Oct 2016 17:13:51 -0400 Subject: [PATCH 1/2] Switch mirrors. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 89a2a84..95f3c01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -RUN echo '@testing http://nl.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories +RUN echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories RUN apk add --no-cache \ curl \ -- 2.51.2 From 9423b557d8735ba3b659ea372326ec0f29af5ddb Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Tue, 18 Oct 2016 16:53:05 -0400 Subject: [PATCH 2/2] Include Cargo. --- .travis.yml | 1 + Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bf70e3a..d69bf14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,4 @@ language: generic script: - docker build -t rust-alpine . - docker run --rm rust-alpine sh -c "echo 'fn main() {}' > a.rs && rustc a.rs && ./a" + - docker run --rm -e "USER=test" rust-alpine sh -c "cargo new --bin b && cd b && cargo run" diff --git a/Dockerfile b/Dockerfile index 95f3c01..3e2d5a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ -FROM alpine:3.4 +FROM alpine:edge RUN echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories RUN apk add --no-cache \ + cargo@testing \ curl \ g++ \ rust@testing -- 2.51.2