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

Jump to bottom

Use rustls for reqwest #2403

Merged
merged 3 commits into from
Feb 23, 2023
Merged

Use rustls for reqwest #2403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3b5ad9
Use rustls for reqwest
rcoh Feb 22, 2023
3684946
Fix MUSL build in image
rcoh Feb 23, 2023
13bef0f
Fix build image
rcoh Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions tools/ci-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ ARG rust_nightly_version=nightly-2022-11-16
FROM ${base_image} AS bare_base_image
RUN yum -y updateinfo

FROM bare_base_image as musl_toolchain
RUN yum -y install tar gzip gcc make
RUN curl https://musl.libc.org/releases/musl-1.2.3.tar.gz -o musl-1.2.3.tar.gz \
&& ls \
&& tar xvzf musl-1.2.3.tar.gz \
&& (cd musl-1.2.3 && ./configure && make install)

#
# Rust & Tools Installation Stage
#
Expand Down Expand Up @@ -51,6 +58,7 @@ RUN set -eux; \
rustup component add rustfmt; \
rustup component add clippy; \
rustup toolchain install ${rust_nightly_version} --component clippy; \
rustup target add x86_64-unknown-linux-musl; \
cargo --version; \
cargo +${rust_nightly_version} --version;

Expand Down Expand Up @@ -106,6 +114,8 @@ ARG maturin_version=0.14.1
ARG rust_nightly_version
RUN cargo +${rust_nightly_version} -Z sparse-registry install maturin --locked --version ${maturin_version}



#
# Final image
#
Expand Down Expand Up @@ -138,6 +148,8 @@ COPY --chown=build:build --from=cargo_minimal_versions /opt/cargo/bin/cargo-mini
COPY --chown=build:build --from=cargo_check_external_types /opt/cargo/bin/cargo-check-external-types /opt/cargo/bin/cargo-check-external-types
COPY --chown=build:build --from=maturin /opt/cargo/bin/maturin /opt/cargo/bin/maturin
COPY --chown=build:build --from=install_rust /opt/rustup /opt/rustup
COPY --chown=build:build --from=musl_toolchain /usr/local/musl/ /usr/local/musl/
ENV PATH=$PATH:/usr/local/musl/bin/
ENV PATH=/opt/cargo/bin:$PATH \
CARGO_HOME=/opt/cargo \
RUSTUP_HOME=/opt/rustup \
Expand Down