Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(dockerfile): Pin Rust version to 1.63.0 in Dockerfile #1482

Merged
merged 4 commits into from
Sep 19, 2022
Merged

build(dockerfile): Pin Rust version to 1.63.0 in Dockerfile #1482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ed4852
build(dockerfile): Pin Rust version to 1.63.0 in Dockerfile
tonyo Sep 19, 2022
64523da
add changelog entry
tonyo Sep 19, 2022
3e1c881
extract version to arg/env
tonyo Sep 19, 2022
157976c
Merge branch 'master' into tonyo/bump-dockerfile-rust-1.63
tonyo Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
**Internal**:

- Generate a new profile ID when splitting a profile for multiple transactions. ([#1473](https://github.com/getsentry/relay/pull/1473))
- Pin Rust version to 1.63.0 in Dockerfile. ([#1482](https://github.com/getsentry/relay/pull/1482))

## 22.9.0

Expand Down
6 changes: 5 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ FROM $DOCKER_ARCH/centos:7 AS relay-deps

ARG DOCKER_ARCH
ARG BUILD_ARCH=x86_64
# Pin the Rust version for now
ARG RUST_TOOLCHAIN_VERSION=1.63.0

ENV DOCKER_ARCH=${DOCKER_ARCH}
ENV BUILD_ARCH=${BUILD_ARCH}
ENV RUST_TOOLCHAIN_VERSION=${RUST_TOOLCHAIN_VERSION}

ENV BUILD_TARGET=${BUILD_ARCH}-unknown-linux-gnu

Expand All @@ -29,7 +32,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
| sh -s -- -y --profile minimal --default-toolchain=${RUST_TOOLCHAIN_VERSION}

COPY --from=sentry-cli /bin/sentry-cli /bin/sentry-cli

Expand Down