chore: draft for multiarch image

Author: joseluisq

Dockerfile

@@ -1,6 +1,6 @@
 # NOTE: Most of Dockerfile and related were borrowed from https://hub.docker.com/r/ekidd/rust-musl-builder
 
-FROM debian:12.11-slim
+FROM debian:12.12-slim
 
 ARG VERSION=0.0.0
 ENV VERSION=${VERSION}
@@ -19,15 +19,17 @@ RUN set -eux \
     && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
         autoconf \
         automake \
+        bison \
         build-essential \
         ca-certificates \
         clang \
         cmake \
         curl \
         file \
+        flex \
+        g++-aarch64-linux-gnu \
         gcc-aarch64-linux-gnu \
         gcc-arm-linux-gnueabihf \
-        g++-aarch64-linux-gnu \
         git \
         libbz2-dev \
         libgmp-dev \
@@ -43,15 +45,15 @@ RUN set -eux \
         llvm-dev \
         lzma-dev \
         musl-dev \
-        musl-dev:armhf \
         musl-dev:arm64 \
+        musl-dev:armhf \
         musl-tools \
         patch \
         pkgconf \
         python3 \
         xutils-dev \
-        yasm \
         xz-utils \
+        yasm \
         zlib1g-dev \
     # Clean up local repository of retrieved packages and remove the package lists
     && apt-get clean \
@@ -80,7 +82,7 @@ RUN set -eux \
 # the popular Rust `hyper` crate.
 
 # OpenSSL 1.1.1 - https://github.com/openssl/openssl/releases
-ARG OPENSSL_VERSION=1.1.1w
+ARG OPENSSL_VERSION=3.5.3
 
 # We point /usr/local/musl/include/linux at some Linux kernel headers (not
 # necessarily the right ones) in an effort to compile OpenSSL 1.1's "engine"
@@ -100,20 +102,35 @@ RUN set -eux \
     && ln -s "/usr/include/$(uname -m)-linux-gnu/asm" /usr/local/musl/include/asm \
     && ln -s /usr/include/asm-generic /usr/local/musl/include/asm-generic \
     && cd /tmp \
-    && ver=$(echo $OPENSSL_VERSION | sed -e 's:\.:_:g') \
-    && curl -LO "https://github.com/openssl/openssl/releases/download/OpenSSL_${ver}/openssl-${OPENSSL_VERSION}.tar.gz" \
+    && curl -LO "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz" \
     && tar xvzf "openssl-${OPENSSL_VERSION}.tar.gz" \
     && cd "openssl-${OPENSSL_VERSION}" \
     && env CC=musl-gcc ./Configure no-shared no-zlib -fPIC --prefix=/usr/local/musl -DOPENSSL_NO_SECURE_MEMORY ${config} "linux-$(uname -m)" \
     && env C_INCLUDE_PATH=/usr/local/musl/include/ make depend \
     && env C_INCLUDE_PATH=/usr/local/musl/include/ make -j$(nproc) \
     && make -j$(nproc) install_sw \
     && make -j$(nproc) install_ssldirs \
-    && rm /usr/local/musl/include/linux /usr/local/musl/include/asm /usr/local/musl/include/asm-generic \
     && openssl version \
+    && rm -rf \
+        /usr/local/musl/include/linux \
+        /usr/local/musl/include/asm \
+        /usr/local/musl/include/asm-generic \
+    && ls -l /usr/local/musl \
+    && if [ "$(uname -m)" = "x86_64" ]; then \
+        ln -s /usr/local/musl/lib64 /usr/local/musl/lib; \
+    fi \
     && rm -r /tmp/* \
     && true
 
+RUN set -eux \
+    && echo "Testing musl-gcc with OpenSSL..." \
+    && openssl version \
+    && echo "int main(){return 0;}" | \
+        musl-gcc -o test -x c - \
+            -I/usr/local/musl/include \
+            -L/usr/local/musl/lib \
+            -lssl -lcrypto \
+    && true
 
 # zlib - http://zlib.net/
 ARG ZLIB_VERSION=1.3.1
@@ -132,7 +149,22 @@ RUN set -eux \
 
 
 # libpq - https://ftp.postgresql.org/pub/source/
-ARG POSTGRESQL_VERSION=15.9
+ARG POSTGRESQL_VERSION=17.6
+ARG ICU4C_VERSION=77.1
+
+RUN set -eux \
+    && echo "Building icu4c..." \
+    && cd /tmp \
+    && ver1=$(echo $ICU4C_VERSION | sed -e 's:\.:-:g') \
+    && ver2=$(echo $ICU4C_VERSION | sed -e 's:\.:_:g') \
+    && curl -LO https://github.com/unicode-org/icu/releases/download/release-${ver1}/icu4c-${ver2}-src.tgz \
+    && tar xf icu4c-${ver2}-src.tgz \
+    && cd icu/source \
+    && env CC=musl-gcc CXX=musl-g++ ./configure --prefix=/usr/local/musl \
+    && make -j$(nproc) \
+    && make -j$(nproc) install \
+    && rm -r /tmp/* \
+    && true
 
 RUN set -eux \
     && echo "Building libpq ${POSTGRESQL_VERSION}..." \
@@ -206,6 +238,8 @@ RUN set -eux \
 ENV PATH=$PATH:/usr/local/osxcross/target/bin
 ENV MACOSX_DEPLOYMENT_TARGET=${OSX_VERSION_MIN}
 ENV OSXCROSS_MACPORTS_MIRROR=https://packages.macports.org
+ENV OSXCROSS_MACPORTS_LOCAL=/usr/local/osxcross/target/macports/pkgs/opt/local
+ENV OSXCROSS_MACPORTS_LIBEXEC=${OSXCROSS_MACPORTS_LOCAL}/libexec
 
 RUN set -eux \
     && echo "Testing osxcross with compiler-rt..." \
@@ -217,10 +251,11 @@ RUN set -eux \
     && echo "Install dependencies via osxcross tools..." \
     && apt-get update \
     && /usr/local/osxcross/tools/get_dependencies.sh \
+    && osxcross-macports install zlib openssl3 \
     && true
 
 # Rust stable toolchain
-ARG TOOLCHAIN=1.86.0
+ARG TOOLCHAIN=1.87.0
 
 # Install our Rust toolchain and the `musl` target. We patch the
 # command-line we pass to the installer so that it won't attempt to
@@ -236,7 +271,7 @@ RUN set -eux \
         x86_64-apple-darwin \
         x86_64-unknown-linux-musl \
     && true
-COPY cargo/config.toml /root/.cargo/config
+COPY cargo/config.toml /root/.cargo/config.toml
 
 RUN set -eux \
     && echo "Removing temp files..." \

Dockerfile.cross

@@ -0,0 +1,191 @@
+FROM joseluisq/docker-osxcross:1.0.0-beta.1
+
+ARG VERSION=0.0.0
+ENV VERSION=${VERSION}
+
+LABEL version="${VERSION}" \
+    description="Use same Docker image for compiling Rust programs for Linux (musl libc) & macOS (osxcross)." \
+    maintainer="Jose Quintana <joseluisq.net>"
+
+# Static linking for C++ code
+RUN set -eux \
+    && ln -s "/usr/bin/g++" "/usr/bin/musl-g++" \
+    # Create appropriate directories for current user
+    && mkdir -p /root/libs /root/src \
+    && true
+
+ENV PATH=/root/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH
+
+##### Rust toolchains
+
+# Rust/Cargo related environment variables
+ENV TARGET=musl
+# Crate-related environment variables
+ENV LIBZ_SYS_STATIC=1
+
+# Rust stable toolchain
+ARG TOOLCHAIN=1.87.0
+
+RUN set -eux \
+    && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=$TOOLCHAIN \
+    && rustup target add \
+        aarch64-apple-darwin \
+        aarch64-unknown-linux-gnu \
+        aarch64-unknown-linux-musl \
+        x86_64-apple-darwin \
+        x86_64-unknown-linux-musl \
+    && true
+
+COPY cargo/config.toml /root/.cargo/config.toml
+
+RUN set -eux \
+    && rustc -vV \
+    && cargo -vV \
+    && true
+
+##### Libraries
+
+# zlib - http://zlib.net/
+ARG ZLIB_VERSION=1.3.1
+
+WORKDIR /tmp
+
+RUN set -eux \
+    && echo "Downloading zlib ${ZLIB_VERSION}..." \
+    && cd /tmp \
+    && curl -LO "https://www.zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz" \
+    && tar xzf "zlib-${ZLIB_VERSION}.tar.gz" \
+    && rm -rf "zlib-${ZLIB_VERSION}.tar.gz" \
+    && true
+    
+WORKDIR /tmp/zlib-${ZLIB_VERSION}
+
+# x86_64 glibc
+RUN set -eux \
+    && make distclean \
+    && CC=gcc ./configure --prefix=/usr/local/x86_64-linux-gnu \
+    && make -j$(nproc) \
+    && make install \
+    && true
+
+# arm64 glibc
+RUN set -eux \
+    && make distclean \
+    && CC=aarch64-linux-gnu-gcc ./configure --prefix=/usr/local/aarch64-linux-gnu \
+    && make -j$(nproc) \
+    && make install \
+    && true
+
+# x86_64 musl
+RUN set -eux \
+    && make distclean \
+    && CC=musl-gcc ./configure --static --prefix=/usr/local/x86_64-linux-musl \
+    && make -j$(nproc) \
+    && make install \
+    && true
+
+WORKDIR /tmp
+
+# OpenSSL 3.5.3 - https://github.com/openssl/openssl/releases
+ARG OPENSSL_VERSION=3.5.3
+
+RUN set -eux \
+    && curl -LO "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz" \
+    && true
+
+# We point /usr/local/musl/include/linux at some Linux kernel headers (not
+# necessarily the right ones) in an effort to compile OpenSSL 1.1's "engine"
+# component. It's possible that this will cause bizarre and terrible things to
+# happen. There may be "sanitized" header
+RUN set -eux \
+    && tar xvzf "openssl-${OPENSSL_VERSION}.tar.gz" \
+    && cd "openssl-${OPENSSL_VERSION}" \
+    && echo "Building OpenSSL ${OPENSSL_VERSION} for x86_64..." \
+    && ls /usr/include/linux \
+    && mkdir -p /usr/local/x86_64-linux-musl/include \
+    && ln -s /usr/include/linux /usr/local/x86_64-linux-musl/include/linux \
+    && ln -s "/usr/include/x86_64-linux-gnu/asm" /usr/local/x86_64-linux-musl/include/asm \
+    && ln -s /usr/include/asm-generic /usr/local/x86_64-linux-musl/include/asm-generic \
+    && env CC=musl-gcc ./Configure no-shared no-zlib \
+        -fPIC --prefix=/usr/local/x86_64-linux-musl \
+        -DOPENSSL_NO_SECURE_MEMORY "linux-x86_64" \
+    && env C_INCLUDE_PATH=/usr/local/x86_64-linux-musl/include/ make depend \
+    && env C_INCLUDE_PATH=/usr/local/x86_64-linux-musl/include/ make -j$(nproc) \
+    && make -j$(nproc) install_sw \
+    && make -j$(nproc) install_ssldirs \
+    && openssl version \
+    && rm -rf \
+        /usr/local/x86_64-linux-musl/include/linux \
+        /usr/local/x86_64-linux-musl/include/asm \
+        /usr/local/x86_64-linux-musl/include/asm-generic \
+    && ls -l /usr/local/x86_64-linux-musl \
+    && if ! [ -d /usr/local/x86_64-linux-musl/lib ]; then \
+            ln -s /usr/local/x86_64-linux-musl/lib64 /usr/local/x86_64-linux-musl/lib; \
+        else \
+            mv /usr/local/x86_64-linux-musl/lib /usr/local/x86_64-linux-musl/abc; \
+            mv /usr/local/x86_64-linux-musl/lib64 /usr/local/x86_64-linux-musl/lib; \
+            cp -rp /usr/local/x86_64-linux-musl/abc/. /usr/local/x86_64-linux-musl/lib/; \
+            unlink /usr/local/x86_64-linux-musl/lib/lib64; \
+            rm -rf /usr/local/x86_64-linux-musl/abc; \
+        fi \
+    && cd .. \
+    && rm -rf "openssl-${OPENSSL_VERSION}" \
+    && true
+
+RUN set -eux \
+    && tar xvzf "openssl-${OPENSSL_VERSION}.tar.gz" \
+    && cd "openssl-${OPENSSL_VERSION}" \
+    && echo "Building OpenSSL ${OPENSSL_VERSION} for aarch64..." \
+    && ls /usr/include/linux \
+    && mkdir -p /usr/local/aarch64-linux-gnu/include \
+    # && ln -s /usr/include/linux /usr/local/aarch64-linux-gnu/include/linux \
+    # && ln -s "/usr/include/aarch64-linux-gnu/asm" /usr/local/aarch64-linux-gnu/include/asm \
+    # && ln -s /usr/include/asm-generic /usr/local/aarch64-linux-gnu/include/asm-generic \
+    && env CC=aarch64-linux-gnu-gcc ./Configure no-shared no-zlib \
+        -fPIC --prefix=/usr/local/aarch64-linux-gnu \
+        -DOPENSSL_NO_SECURE_MEMORY -mno-outline-atomics "linux-aarch64" \
+    && env C_INCLUDE_PATH=/usr/local/aarch64-linux-gnu/include/ make depend \
+    && env C_INCLUDE_PATH=/usr/local/aarch64-linux-gnu/include/ make -j$(nproc) \
+    && make -j$(nproc) install_sw \
+    && make -j$(nproc) install_ssldirs \
+    && openssl version \
+    && rm -rf \
+        /usr/local/aarch64-linux-gnu/include/linux \
+        /usr/local/aarch64-linux-gnu/include/asm \
+        /usr/local/aarch64-linux-gnu/include/asm-generic \
+    && ls -l /usr/local/aarch64-linux-gnu \
+    && cd .. \
+    && rm -rf "openssl-${OPENSSL_VERSION}" \
+    && true
+
+RUN set -eux \
+    && echo "Testing musl-gcc with OpenSSL..." \
+    && openssl version \
+    && echo "int main(){return 0;}" | \
+        musl-gcc -o test -x c - \
+            -I/usr/local/x86_64-linux-musl/include \
+            -L/usr/local/x86_64-linux-musl/lib \
+            -lssl -lcrypto \
+    && true
+
+WORKDIR /root
+
+# OpenSSL related environment variables
+ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/x86_64-linux-musl
+ENV AARCH64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/aarch64-linux-gnu
+ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_STATIC=1
+ENV AARCH64_UNKNOWN_LINUX_MUSL_OPENSSL_STATIC=1
+
+# pkg-config related environment variables
+ENV PKG_CONFIG_ALLOW_CROSS=true \
+    PKG_CONFIG_ALL_STATIC=true
+
+RUN set -eux \
+    && echo "Removing temp files..." \
+    && rm -rf *~ taballs *.tar.xz \
+    && rm -rf /tmp/* \
+    && true
+
+WORKDIR /root/src
+
+CMD ["bash"]