Skip to content

Commit

Permalink
Merge pull request #6 from Asone/fix/rust_nightly_build
Browse files Browse the repository at this point in the history
fix: replace old FROM with a functionnal build on the go of rust nightly
  • Loading branch information
Asone committed Nov 5, 2018
2 parents b5679e6 + 7f11ea6 commit dfda239
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 3 deletions.
20 changes: 19 additions & 1 deletion _provisioning/an-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,27 @@
FROM rustlang/rust:nightly

FROM buildpack-deps:stretch

LABEL AUTHOR="Nelson Herbin <[email protected]>"
LABEL NAME=tricoteuses-an-api
LABEL VERSION=1

ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH

RUN set -eux; \
\
url="https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init"; \
wget "$url"; \
chmod +x rustup-init; \
./rustup-init -y --no-modify-path --default-toolchain nightly; \
rm rustup-init; \
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
rustup --version; \
cargo --version; \
rustc --version;


RUN apt-get update && \
apt-get install -y unzip graphicsmagick

Expand Down
20 changes: 19 additions & 1 deletion _provisioning/senat-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,27 @@
FROM rustlang/rust:nightly
FROM buildpack-deps:stretch

LABEL AUTHOR="Nelson Herbin <[email protected]>"
LABEL NAME=tricoteuses-senat-api
LABEL VERSION=1

ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH

RUN set -eux; \
\
url="https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init"; \
wget "$url"; \
chmod +x rustup-init; \
./rustup-init -y --no-modify-path --default-toolchain nightly; \
rm rustup-init; \
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
rustup --version; \
cargo --version; \
rustc --version;

LABEL VERSION=1

RUN apt-get update && \
apt-get install -y unzip graphicsmagick

Expand Down
18 changes: 17 additions & 1 deletion _provisioning/wikidata-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
FROM rustlang/rust:nightly
FROM buildpack-deps:stretch

LABEL AUTHOR="Nelson Herbin <[email protected]>"
LABEL NAME=tricoteuses-wikidata-api
LABEL VERSION=1

ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH

RUN set -eux; \
\
url="https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init"; \
wget "$url"; \
chmod +x rustup-init; \
./rustup-init -y --no-modify-path --default-toolchain nightly; \
rm rustup-init; \
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
rustup --version; \
cargo --version; \
rustc --version;

RUN apt-get update && \
apt-get install -y unzip

Expand Down

0 comments on commit dfda239

Please sign in to comment.