Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

Commit

Permalink
Switch back to rust official image and to stable Rust
Browse files Browse the repository at this point in the history
  • Loading branch information
williamdes committed Jun 9, 2021
1 parent ed3f408 commit f57d66a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
toolchain: stable
override: true
- name: Build
uses: actions-rs/cargo@v1
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
toolchain: stable
override: true
- name: Test
uses: actions-rs/cargo@v1
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# See: https://crates.io/crates/cargo-chef

FROM rustlang/rust:nightly-alpine as planner
FROM rust:1.52-alpine as planner

ADD \
Cargo.toml \
Expand All @@ -15,7 +15,7 @@ RUN apk add --no-cache --update musl-dev
RUN cargo install cargo-chef
RUN cargo chef prepare --recipe-path recipe.json

FROM rustlang/rust:nightly-alpine as cacher
FROM rust:1.52-alpine as cacher

WORKDIR /workspace

Expand All @@ -24,7 +24,7 @@ RUN cargo install cargo-chef
COPY --from=planner /workspace/recipe.json recipe.json
RUN cargo chef cook --release --recipe-path recipe.json

FROM rustlang/rust:nightly-alpine as builder
FROM rust:1.52-alpine as builder

COPY . /workspace
WORKDIR /workspace
Expand All @@ -36,7 +36,7 @@ RUN apk add --no-cache --update mariadb-connector-c-dev musl-dev
# https://users.rust-lang.org/t/sigsegv-with-program-linked-against-openssl-in-an-alpine-container/52172
RUN RUSTFLAGS="-C target-feature=-crt-static" cargo build --release --bin air-balloon-api

FROM rustlang/rust:nightly-alpine as diesel-build
FROM rust:1.52-alpine as diesel-build

COPY --from=cacher $CARGO_HOME $CARGO_HOME
RUN apk add --no-cache --update mariadb-connector-c-dev musl-dev
Expand Down

0 comments on commit f57d66a

Please sign in to comment.