Fixes docker builds

alexis-opolka · alexis-opolka · commit da315f41fc82 · 2025-05-04T15:40:09.000+02:00
Signed-off-by: alexis-opolka &lt;53085471+alexis-opolka@users.noreply.github.com&gt;
diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml
@@ -7,10 +7,10 @@ inputs:
     required: true
   target:
     description: 'Target'
-    required: true
+    required: false
   components:
     description: 'Components'
-    required: true
+    required: false
 
 runs:
   using: composite
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,6 +21,7 @@ name: CI
 env:
   CARGO_NET_RETRY: 3
   CARGO_HTTP_CHECK_REVOKE: false
+  CROSS_IMAGE: ghcr.io/${{ github.repository_owner }}
 
 jobs:
   shellcheck:
@@ -31,7 +32,9 @@ jobs:
           ref: ${{ inputs.checkout-ref }}
 
       - name: Run ShellCheck
-        uses: azohra/shell-linter@v0.6.0
+        uses: Azbagheri/shell-linter@latest
+        with:
+          exclude-paths: ".github/CODEOWNERS,LICENSE-APACHE,LICENSE-MIT"
 
   cargo-deny:
     runs-on: ubuntu-latest
@@ -229,7 +232,7 @@ jobs:
         run: ./ci/test-cross-image.sh
         env:
           TARGET: 'aarch64-unknown-linux-gnu'
-          IMAGE: 'ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main'
+          IMAGE: 'ghcr.io/${{ github.repository_owner }}/aarch64-unknown-linux-gnu:main'
         shell: bash
 
       - name: Login to GitHub Container Registry
@@ -342,7 +345,7 @@ jobs:
       - name: Run Docker-in-Docker Test
         env:
           TARGET: aarch64-unknown-linux-gnu
-          IMAGE: 'ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main'
+          IMAGE: 'ghcr.io/${{ github.repository_owner }}/aarch64-unknown-linux-gnu:main'
         run: ./ci/test-docker-in-docker.sh
         shell: bash
 
diff --git a/docker/Dockerfile.armv5te-unknown-linux-musleabi b/docker/Dockerfile.armv5te-unknown-linux-musleabi
@@ -16,11 +16,7 @@ COPY qemu.sh /
 RUN /qemu.sh arm
 
 COPY musl.sh /
-RUN /musl.sh \
-    TARGET=arm-linux-musleabi \
-    "COMMON_CONFIG += --with-arch=armv5te \
-                      --with-float=soft \
-                      --with-mode=arm"
+RUN /musl.sh TARGET=arm-linux-musleabi "COMMON_CONFIG += --with-arch=armv5te --with-float=soft --with-mode=arm"
 
 COPY tidyup.sh /
 RUN /tidyup.sh
diff --git a/docker/Dockerfile.native.centos b/docker/Dockerfile.native.centos
@@ -17,7 +17,6 @@ RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \
   -e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!'
 RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
 
-
 COPY common.sh lib.sh /
 RUN /common.sh
 
diff --git a/docker/aarch64-linux-gnu-glibc.sh b/docker/aarch64-linux-gnu-glibc.sh
@@ -8,7 +8,7 @@ set -euo pipefail
 
 unpack_rpm() {
     local package="${1}"
-    curl --retry 3 "http://mirror.centos.org/altarch/7/os/aarch64/Packages/${package}" -O
+    curl --retry 3 "https://vault.centos.org/altarch/7/os/aarch64/Packages/${package}" -O
     rpm2cpio "${package}" | cpio -idmv
 }
 
diff --git a/docker/cmake.sh b/docker/cmake.sh
@@ -19,10 +19,12 @@ main() {
     local cmake_sha256
 
     local narch
-    narch="$(dpkg --print-architecture)"
+    narch="$(uname -p)"
+
+    echo "[INFO] $narch"
 
     case "${narch}" in
-        amd64)
+        x86_64)
             cmake_arch="linux-x86_64"
             cmake_sha256="da2a9b18c3bfb136917fa1a579aa5316b01c1d6c111043d03f18877ff05bda30"
             ;;
diff --git a/docker/freebsd.sh b/docker/freebsd.sh
@@ -79,7 +79,7 @@ latest_freebsd() {
     local releases=
     local max_release=
 
-    response=$(curl --retry 3 -sSfL "${mirror}/${FREEBSD_ARCH}/" | grep RELEASE)
+    response=$(curl -4 --retry 3 -sSfL "${mirror}/${FREEBSD_ARCH}/" | grep RELEASE)
     if [[ "${response}" != *RELEASE* ]]; then
         echo -e "\e[31merror:\e[0m could not find a candidate release for FreeBSD ${FREEBSD_MAJOR}." 1>&2
         exit 1
@@ -115,7 +115,7 @@ _freebsd_mirror() {
         # we need a timeout in case the server is down to avoid
         # infinitely hanging. timeout error code is always 124
         # these mirrors can be quite slow, so have a long timeout
-        timeout 20s curl --retry 3 -sSfL "${mirror}/${FREEBSD_ARCH}/" >/dev/null
+        timeout 20s curl -4 --retry 3 -sSfL "${mirror}/${FREEBSD_ARCH}/" >/dev/null
         code=$?
         if [[ "${code}" == 0 ]]; then
             echo "${mirror}"
@@ -173,7 +173,7 @@ main() {
     ./contrib/download_prerequisites
     cd ..
 
-    curl --retry 3 -sSfL "${bsd_url}/base.txz" -O
+    curl -4 --retry 3 -sSfL "${bsd_url}/base.txz" -O
     tar -C "${td}/freebsd" -xJf base.txz ./usr/include ./usr/lib ./lib
 
     cd binutils-build
@@ -243,7 +243,7 @@ main() {
     purge_packages
 
     # store the version info for the FreeBSD release
-    bsd_revision=$(curl --retry 3 -sSfL "${bsd_url}/REVISION")
+    bsd_revision=$(curl -4 --retry 3 -sSfL "${bsd_url}/REVISION")
     echo "${base_release} (${bsd_revision})" > /opt/freebsd-version
 
     rm -rf "${td}"
diff --git a/docker/lib.sh b/docker/lib.sh
@@ -78,7 +78,7 @@ download_mirrors() {
     shift
 
     for mirror in "${@}"; do
-        if curl --retry 3 -sSfL "${mirror}/${relpath}/${filename}" -O; then
+        if curl -4 --retry 3 -sSfL "${mirror}/${relpath}/${filename}" -O; then
             break
         fi
     done
diff --git a/docker/linux-image.sh b/docker/linux-image.sh
@@ -57,7 +57,7 @@ max_kernel_version() {
 main() {
     # arch in the rust target
     local arch="${1}" \
-        kversion=5.10.0-33
+        kversion=5.10.0-34
 
     local debsource="deb http://http.debian.net/debian/ bullseye main"
     debsource="${debsource}\ndeb http://security.debian.org/ bullseye-security main"
diff --git a/docker/netbsd.sh b/docker/netbsd.sh
@@ -57,10 +57,10 @@ main() {
         "ftp://ftp.netbsd.org"
         "https://cdn.NetBSD.org"
     )
-    download_mirrors "pub/NetBSD/NetBSD-9.2/amd64/binary/sets" "base.tar.xz" "${mirrors[@]}"
+    download_mirrors "pub/NetBSD/NetBSD-9.3/amd64/binary/sets" "base.tar.xz" "${mirrors[@]}"
     tar -C "${td}/netbsd" -xJf base.tar.xz ./usr/include ./usr/lib ./lib
 
-    download_mirrors "pub/NetBSD/NetBSD-9.2/amd64/binary/sets" "comp.tar.xz" "${mirrors[@]}"
+    download_mirrors "pub/NetBSD/NetBSD-9.3/amd64/binary/sets" "comp.tar.xz" "${mirrors[@]}"
     tar -C "${td}/netbsd" -xJf comp.tar.xz ./usr/include ./usr/lib
 
     pushd binutils-build
diff --git a/docker/qemu.sh b/docker/qemu.sh
@@ -173,8 +173,12 @@ main() {
         zlib-devel \
         zlib-static
 
-    if_centos 'curl --retry 3 -sSfL "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" -o /usr/share/automake*/config.guess'
-    if_centos 'curl --retry 3 -sSfL "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" -o /usr/share/automake*/config.sub'
+    ### See this thread in case there are other issues regarding Savannah from gnu
+    ### https://lists.nongnu.org/archive/html/savannah-hackers-public/2025-04/msg00003.html
+    ### This link should be a good reference for the config.git repository: https://cgit.git.savannah.gnu.org/cgit/config.git/
+
+    if_centos 'curl --retry 3 -sSfL "https://gitweb.git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" -o /usr/share/automake*/config.guess'
+    if_centos 'curl --retry 3 -sSfL "https://gitweb.git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" -o /usr/share/automake*/config.sub'
 
     # these are not packaged as static libraries in centos; build them manually
     if_centos build_static_libffi
diff --git a/src/bin/commands/images.rs b/src/bin/commands/images.rs
@@ -8,6 +8,7 @@ use cross::{CommandExt, TargetList};
 
 // known image prefixes, with their registry
 // the docker.io registry can also be implicit
+
 const GHCR_IO: &str = docker::CROSS_IMAGE;
 const RUST_EMBEDDED: &str = "rustembedded/cross";
 const DOCKER_IO: &str = "docker.io/rustembedded/cross";
diff --git a/src/docker/shared.rs b/src/docker/shared.rs
@@ -1,9 +1,3 @@
-use std::io::Write;
-use std::path::{Path, PathBuf};
-use std::process::{Command, ExitStatus, Output};
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::{env, fs, time};
-
 use super::custom::{Dockerfile, PreBuild};
 use super::image::PossibleImage;
 use super::Image;
@@ -18,12 +12,23 @@ use crate::id;
 use crate::rustc::QualifiedToolchain;
 use crate::shell::{ColorChoice, MessageInfo, Verbosity};
 use crate::{CommandVariant, OutputExt, Target, TargetTriple};
+use std::io::Write;
+use std::path::{Path, PathBuf};
+use std::process::{Command, ExitStatus, Output};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::{env, fs, time};
 
 use rustc_version::Version as RustcVersion;
 
 pub use super::custom::CROSS_CUSTOM_DOCKERFILE_IMAGE_PREFIX;
+pub const CROSS_IMAGE: &str = {
+    if let Some(opt) = option_env!("CROSS_IMAGE") {
+        opt
+    } else {
+        "ghcr.io/cross-rs"
+    }
+};
 
-pub const CROSS_IMAGE: &str = "ghcr.io/cross-rs";
 // note: this is the most common base image for our images
 pub const UBUNTU_BASE: &str = "ubuntu:20.04";
 pub const DEFAULT_IMAGE_VERSION: &str = if crate::commit_info().is_empty() {
@@ -1619,7 +1624,7 @@ mod tests {
                 } else {
                     "x86_64-unknown-linux-gnu"
                 };
-                let expected = format!("ghcr.io/cross-rs/{expected_image_target}{expected_ver}");
+                let expected = format!("{CROSS_IMAGE}/{expected_image_target}{expected_ver}");
 
                 let image = get_image(&config, &target, uses_zig)?;
                 assert_eq!(image.reference.get(), expected);
diff --git a/targets.toml b/targets.toml
@@ -5,7 +5,7 @@
 
 [[target]]
 target = "x86_64-apple-darwin"
-os = "macos-12"
+os = "macos-13"
 special = true
 deploy = true
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ set -euo pipefail`
`8`	`8`
`9`	`9`	`unpack_rpm() {`
`10`	`10`	`local package="${1}"`
`11`		`- curl --retry 3 "http://mirror.centos.org/altarch/7/os/aarch64/Packages/${package}" -O`
	`11`	`+ curl --retry 3 "https://vault.centos.org/altarch/7/os/aarch64/Packages/${package}" -O`
`12`	`12`	`rpm2cpio "${package}" \| cpio -idmv`
`13`	`13`	`}`
`14`	`14`