Skip to content

Commit

Permalink
modify stable dockerfiles version with "1.46.0"
Browse files Browse the repository at this point in the history
  • Loading branch information
Travis CI User authored and travis-ci committed Sep 14, 2020
1 parent bb3c39c commit 341f215
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dockerfiles/all/Dockerfile
Expand Up @@ -25,7 +25,7 @@ ENV OPENSSL_LIB_DIR=/usr/local/ssl/lib \

# install all 3 toolchains
RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain stable -y && \
sh -s -- --default-toolchain 1.46.0 -y && \
/root/.cargo/bin/rustup update beta && \
/root/.cargo/bin/rustup update nightly

Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/all_musl/Dockerfile
Expand Up @@ -25,7 +25,7 @@ ENV OPENSSL_LIB_DIR=/usr/local/ssl/lib \

# install all 3 toolchains
RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain stable -y && \
sh -s -- --default-toolchain 1.46.0 -y && \
/root/.cargo/bin/rustup update beta && \
/root/.cargo/bin/rustup update nightly

Expand All @@ -39,7 +39,7 @@ RUN apt-get update && \

# install all 3 musl targets
RUN rustup target add x86_64-unknown-linux-musl \
--toolchain stable-x86_64-unknown-linux-gnu && \
--toolchain 1.46.0-x86_64-unknown-linux-gnu && \
rustup target add x86_64-unknown-linux-musl \
--toolchain beta-x86_64-unknown-linux-gnu && \
rustup target add x86_64-unknown-linux-musl \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/plus/Dockerfile
Expand Up @@ -25,7 +25,7 @@ ENV OPENSSL_LIB_DIR=/usr/local/ssl/lib \

# install all 3 toolchains
RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain stable -y && \
sh -s -- --default-toolchain 1.46.0 -y && \
/root/.cargo/bin/rustup update beta && \
/root/.cargo/bin/rustup update nightly

Expand All @@ -39,7 +39,7 @@ RUN apt-get update && \

# install all 3 musl targets
RUN rustup target add x86_64-unknown-linux-musl \
--toolchain stable-x86_64-unknown-linux-gnu && \
--toolchain 1.46.0-x86_64-unknown-linux-gnu && \
rustup target add x86_64-unknown-linux-musl \
--toolchain beta-x86_64-unknown-linux-gnu && \
rustup target add x86_64-unknown-linux-musl \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/stable/Dockerfile
Expand Up @@ -25,6 +25,6 @@ ENV OPENSSL_LIB_DIR=/usr/local/ssl/lib \

# install toolchain
RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain stable -y
sh -s -- --default-toolchain 1.46.0 -y

ENV PATH=/root/.cargo/bin:$PATH
4 changes: 2 additions & 2 deletions dockerfiles/stable_musl/Dockerfile
Expand Up @@ -25,7 +25,7 @@ ENV OPENSSL_LIB_DIR=/usr/local/ssl/lib \

# install toolchain
RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain stable -y
sh -s -- --default-toolchain 1.46.0 -y

ENV PATH=/root/.cargo/bin:$PATH

Expand All @@ -37,7 +37,7 @@ RUN apt-get update && \

# install musl target
RUN rustup target add x86_64-unknown-linux-musl \
--toolchain stable-x86_64-unknown-linux-gnu
--toolchain 1.46.0-x86_64-unknown-linux-gnu

# make default target to musl
RUN mkdir /.cargo && \
Expand Down

0 comments on commit 341f215

Please sign in to comment.