Skip to content

Commit bc1ff79

Browse files
authored
fix(bottlecap): remove nightly in favor or stable (#341)
* remove `nightly` in favor or `stable` also removed `-Z` flags * remove `libgcc` as it seems we do not need it yet * remove `echo`s
1 parent 4bc18d6 commit bc1ff79

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.gitlab/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ RUN chmod +x /install-protoc.sh && /install-protoc.sh
1313

1414
# Install Rust
1515
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
16-
sh -s -- --profile minimal --default-toolchain nightly -y
16+
sh -s -- --profile minimal --default-toolchain stable -y
1717

1818
RUN source $HOME/.cargo/env
1919
ENV PATH /root/.cargo/bin/:$PATH
2020

21-
RUN rustup component add rust-src --toolchain nightly
21+
RUN rustup component add rust-src --toolchain stable
2222

2323

scripts/Dockerfile.bottlecap.alpine.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ RUN apk add --no-cache protoc
1111

1212
# Install Rust Toolchain
1313
RUN curl https://sh.rustup.rs -sSf | \
14-
sh -s -- --profile minimal --default-toolchain nightly-$PLATFORM-unknown-linux-musl -y
14+
sh -s -- --profile minimal --default-toolchain stable-$PLATFORM-unknown-linux-musl -y
1515
ENV PATH=/root/.cargo/bin:$PATH
16-
RUN rustup component add rust-src --toolchain nightly-$PLATFORM-unknown-linux-musl
16+
RUN rustup component add rust-src --toolchain stable-$PLATFORM-unknown-linux-musl
1717

1818
# Build Bottlecap
1919
RUN mkdir -p /tmp/dd
2020
COPY ./bottlecap/src /tmp/dd/bottlecap/src
2121
COPY ./bottlecap/Cargo.toml /tmp/dd/bottlecap/Cargo.toml
2222
COPY ./bottlecap/Cargo.lock /tmp/dd/bottlecap/Cargo.lock
2323
# Added `-C link-arg=-lgcc` for alpine.
24-
ENV RUSTFLAGS="-C panic=abort -C link-arg=-lgcc -Z location-detail=none"
24+
ENV RUSTFLAGS="-C panic=abort -C link-arg=-lgcc"
2525
WORKDIR /tmp/dd/bottlecap
26-
RUN --mount=type=cache,target=/root/.cargo/registry cargo +nightly build -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --release --target $PLATFORM-unknown-linux-musl
26+
RUN --mount=type=cache,target=/root/.cargo/registry cargo +stable build --release --target $PLATFORM-unknown-linux-musl
2727
RUN cp /tmp/dd/bottlecap/target/$PLATFORM-unknown-linux-musl/release/bottlecap /tmp/dd/bottlecap/bottlecap
2828

2929
# Zip Extension

scripts/Dockerfile.bottlecap.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ RUN chmod +x /install-protoc.sh && /install-protoc.sh
1010

1111
# Install Rust Toolchain
1212
RUN curl https://sh.rustup.rs -sSf | \
13-
sh -s -- --profile minimal --default-toolchain nightly-$PLATFORM-unknown-linux-gnu -y
13+
sh -s -- --profile minimal --default-toolchain stable-$PLATFORM-unknown-linux-gnu -y
1414
ENV PATH=/root/.cargo/bin:$PATH
15-
RUN rustup component add rust-src --toolchain nightly-$PLATFORM-unknown-linux-gnu
15+
RUN rustup component add rust-src --toolchain stable-$PLATFORM-unknown-linux-gnu
1616

1717
# Build Bottlecap
1818
RUN mkdir -p /tmp/dd
1919
COPY ./bottlecap/src /tmp/dd/bottlecap/src
2020
COPY ./bottlecap/Cargo.toml /tmp/dd/bottlecap/Cargo.toml
2121
COPY ./bottlecap/Cargo.lock /tmp/dd/bottlecap/Cargo.lock
22-
ENV RUSTFLAGS="-C panic=abort -Z location-detail=none"
22+
ENV RUSTFLAGS="-C panic=abort"
2323
WORKDIR /tmp/dd/bottlecap
24-
RUN --mount=type=cache,target=/usr/local/cargo/registry cargo +nightly build -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --release --target $PLATFORM-unknown-linux-gnu
24+
RUN --mount=type=cache,target=/usr/local/cargo/registry cargo +stable build --release --target $PLATFORM-unknown-linux-gnu
2525
RUN cp /tmp/dd/bottlecap/target/$PLATFORM-unknown-linux-gnu/release/bottlecap /tmp/dd/bottlecap/bottlecap
2626

2727
# Zip Extension

0 commit comments

Comments
 (0)