Skip to content

Commit fd138e8

Browse files
shekhirinfgimenez
andauthored
ci: use HTTPS and increase timeouts for APT in Dockerfiles (#16546)
Co-authored-by: Federico Gimenez <[email protected]>
1 parent 20607a5 commit fd138e8

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

Cross.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
[build]
22
pre-build = [
3+
# Use HTTPS for package sources
4+
"apt-get update && apt-get install --assume-yes --no-install-recommends ca-certificates",
5+
"find /etc/apt/ -type f \\( -name '*.list' -o -name '*.sources' \\) -exec sed -i 's|http://|https://|g' {} +",
6+
7+
# Configure APT retries and timeouts to handle network issues
8+
"echo 'Acquire::Retries \"3\";' > /etc/apt/apt.conf.d/80-retries",
9+
"echo 'Acquire::http::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
10+
"echo 'Acquire::ftp::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
11+
312
# rust-bindgen dependencies: llvm-dev libclang-dev (>= 10) clang (>= 10)
413
# See: https://github.com/cross-rs/cross/wiki/FAQ#using-clang--bindgen for
514
# recommended clang versions for the given cross and bindgen version.

Dockerfile.x86_64-pc-windows-gnu

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
FROM ubuntu:24.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

4-
RUN apt-get update && apt-get install --assume-yes --no-install-recommends git ca-certificates
4+
# Use HTTPS for package sources
5+
RUN apt-get update && apt-get install --assume-yes --no-install-recommends ca-certificates
6+
RUN find /etc/apt/ -type f \( -name '*.list' -o -name '*.sources' \) -exec sed -i 's|http://|https://|g' {} +
7+
8+
# Configure APT retries and timeouts to handle network issues
9+
RUN echo 'Acquire::Retries \"3\";' > /etc/apt/apt.conf.d/80-retries && \
10+
echo 'Acquire::http::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries && \
11+
echo 'Acquire::ftp::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries
12+
13+
RUN apt-get update && apt-get install --assume-yes --no-install-recommends git
514

615
RUN git clone https://github.com/cross-rs/cross /cross
716
WORKDIR /cross/docker

0 commit comments

Comments
 (0)