fix: copy Dockerfiles from rivet with rust:1.88.0 base

2026-04-19 02:01:37 +00:00 · 2026-01-27 18:05:36 -08:00 · 2026-01-27 18:05:36 -08:00 · 41813f6572
commit 41813f6572
parent ef56a5231c
4 changed files with 88 additions and 29 deletions
--- a/docker/release/linux-x86_64.Dockerfile
+++ b/docker/release/linux-x86_64.Dockerfile
@ -1,42 +1,73 @@
 # syntax=docker/dockerfile:1.10.0
-FROM rust:1.91.0 AS builder
+FROM rust:1.88.0 AS base

-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update -y && \
-    apt-get install -y \
+# Install dependencies
+RUN apt-get update && apt-get install -y \
    musl-tools \
    musl-dev \
+    llvm-14-dev \
+    libclang-14-dev \
+    clang-14 \
+    libssl-dev \
    pkg-config \
    ca-certificates \
+    g++ \
+    g++-multilib \
    git \
-    perl \
-    make && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# Build OpenSSL for musl target
-RUN curl -sL https://www.openssl.org/source/openssl-3.2.0.tar.gz | tar xz && \
-    cd openssl-3.2.0 && \
-    CC=musl-gcc ./Configure no-shared no-async --prefix=/usr/local/musl linux-x86_64 && \
-    make -j$(nproc) && \
-    make install_sw && \
-    cd .. && rm -rf openssl-3.2.0
+    curl && \
+    rm -rf /var/lib/apt/lists/* && \
+    wget -q https://github.com/cross-tools/musl-cross/releases/latest/download/x86_64-unknown-linux-musl.tar.xz && \
+    tar -xf x86_64-unknown-linux-musl.tar.xz -C /opt/ && \
+    rm x86_64-unknown-linux-musl.tar.xz

+# Install musl targets
 RUN rustup target add x86_64-unknown-linux-musl

-ENV OPENSSL_DIR=/usr/local/musl \
-    OPENSSL_STATIC=1 \
+# Set environment variables
+ENV PATH="/opt/x86_64-unknown-linux-musl/bin:$PATH" \
+    LIBCLANG_PATH=/usr/lib/llvm-14/lib \
+    CLANG_PATH=/usr/bin/clang-14 \
+    CC_x86_64_unknown_linux_musl=x86_64-unknown-linux-musl-gcc \
+    CXX_x86_64_unknown_linux_musl=x86_64-unknown-linux-musl-g++ \
+    AR_x86_64_unknown_linux_musl=x86_64-unknown-linux-musl-ar \
+    CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=x86_64-unknown-linux-musl-gcc \
+    CARGO_INCREMENTAL=0 \
+    RUSTFLAGS="-C target-feature=+crt-static -C link-arg=-static-libgcc" \
+    CARGO_NET_GIT_FETCH_WITH_CLI=true
+
+# Set working directory
+WORKDIR /build
+
+# Build for x86_64
+FROM base AS x86_64-builder
+
+# Set up OpenSSL for x86_64 musl target
+ENV SSL_VER=1.1.1w
+RUN wget https://www.openssl.org/source/openssl-$SSL_VER.tar.gz \
+    && tar -xzf openssl-$SSL_VER.tar.gz \
+    && cd openssl-$SSL_VER \
+    && ./Configure no-shared no-async --prefix=/musl --openssldir=/musl/ssl linux-x86_64 \
+    && make -j$(nproc) \
+    && make install_sw \
+    && cd .. \
+    && rm -rf openssl-$SSL_VER*
+
+# Configure OpenSSL env vars for the build
+ENV OPENSSL_DIR=/musl \
+    OPENSSL_INCLUDE_DIR=/musl/include \
+    OPENSSL_LIB_DIR=/musl/lib \
    PKG_CONFIG_ALLOW_CROSS=1

-WORKDIR /build
+# Copy the source code
 COPY . .

+# Build for Linux with musl (static binary) - x86_64
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
    --mount=type=cache,target=/usr/local/cargo/git \
    --mount=type=cache,target=/build/target \
-    RUSTFLAGS="-C target-feature=+crt-static" \
    cargo build -p sandbox-agent --release --target x86_64-unknown-linux-musl && \
    mkdir -p /artifacts && \
    cp target/x86_64-unknown-linux-musl/release/sandbox-agent /artifacts/sandbox-agent-x86_64-unknown-linux-musl

+# Default command to show help
 CMD ["ls", "-la", "/artifacts"]
--- a/docker/release/macos-aarch64.Dockerfile
+++ b/docker/release/macos-aarch64.Dockerfile
@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.10.0
-FROM rust:1.91.0 AS base
+FROM rust:1.88.0 AS base

-ENV DEBIAN_FRONTEND=noninteractive
+# Install dependencies
 RUN apt-get update && apt-get install -y \
    clang \
    cmake \
@ -21,8 +21,10 @@ RUN git config --global --add safe.directory '*' && \
    mv MacOSX11.3.sdk.tar.xz tarballs/ && \
    UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh

+# Add osxcross to PATH
 ENV PATH="/root/osxcross/target/bin:$PATH"

+# Tell Clang/bindgen to use the macOS SDK, and nudge Clang to prefer osxcross binutils.
 ENV OSXCROSS_SDK=MacOSX11.3.sdk \
    SDKROOT=/root/osxcross/target/SDK/MacOSX11.3.sdk \
    BINDGEN_EXTRA_CLANG_ARGS_aarch64_apple_darwin="--sysroot=/root/osxcross/target/SDK/MacOSX11.3.sdk -isystem /root/osxcross/target/SDK/MacOSX11.3.sdk/usr/include" \
@ -37,12 +39,16 @@ ENV OSXCROSS_SDK=MacOSX11.3.sdk \
    CARGO_INCREMENTAL=0 \
    CARGO_NET_GIT_FETCH_WITH_CLI=true

+# Set working directory
 WORKDIR /build

+# Build for ARM64 macOS
 FROM base AS aarch64-builder

+# Install macOS ARM64 target
 RUN rustup target add aarch64-apple-darwin

+# Configure Cargo for cross-compilation (ARM64)
 RUN mkdir -p /root/.cargo && \
    echo '\
 [target.aarch64-apple-darwin]\n\
@ -50,8 +56,10 @@ linker = "aarch64-apple-darwin20.4-clang"\n\
 ar = "aarch64-apple-darwin20.4-ar"\n\
 ' > /root/.cargo/config.toml

+# Copy the source code
 COPY . .

+# Build for ARM64 macOS
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
    --mount=type=cache,target=/usr/local/cargo/git \
    --mount=type=cache,target=/build/target \
@ -59,4 +67,5 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
    mkdir -p /artifacts && \
    cp target/aarch64-apple-darwin/release/sandbox-agent /artifacts/sandbox-agent-aarch64-apple-darwin

+# Default command to show help
 CMD ["ls", "-la", "/artifacts"]
--- a/docker/release/macos-x86_64.Dockerfile
+++ b/docker/release/macos-x86_64.Dockerfile
@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.10.0
-FROM rust:1.91.0 AS base
+FROM rust:1.88.0 AS base

-ENV DEBIAN_FRONTEND=noninteractive
+# Install dependencies
 RUN apt-get update && apt-get install -y \
    clang \
    cmake \
@ -21,8 +21,10 @@ RUN git config --global --add safe.directory '*' && \
    mv MacOSX11.3.sdk.tar.xz tarballs/ && \
    UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh

+# Add osxcross to PATH
 ENV PATH="/root/osxcross/target/bin:$PATH"

+# Tell Clang/bindgen to use the macOS SDK, and nudge Clang to prefer osxcross binutils.
 ENV OSXCROSS_SDK=MacOSX11.3.sdk \
    SDKROOT=/root/osxcross/target/SDK/MacOSX11.3.sdk \
    BINDGEN_EXTRA_CLANG_ARGS_X86_64_apple_darwin="--sysroot=/root/osxcross/target/SDK/MacOSX11.3.sdk -isystem /root/osxcross/target/SDK/MacOSX11.3.sdk/usr/include" \
@ -37,12 +39,16 @@ ENV OSXCROSS_SDK=MacOSX11.3.sdk \
    CARGO_INCREMENTAL=0 \
    CARGO_NET_GIT_FETCH_WITH_CLI=true

+# Set working directory
 WORKDIR /build

+# Build for x86_64 macOS
 FROM base AS x86_64-builder

+# Install macOS x86_64 target
 RUN rustup target add x86_64-apple-darwin

+# Configure Cargo for cross-compilation (x86_64)
 RUN mkdir -p /root/.cargo && \
    echo '\
 [target.x86_64-apple-darwin]\n\
@ -50,8 +56,10 @@ linker = "x86_64-apple-darwin20.4-clang"\n\
 ar = "x86_64-apple-darwin20.4-ar"\n\
 ' > /root/.cargo/config.toml

+# Copy the source code
 COPY . .

+# Build for x86_64 macOS
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
    --mount=type=cache,target=/usr/local/cargo/git \
    --mount=type=cache,target=/build/target \
@ -59,4 +67,5 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
    mkdir -p /artifacts && \
    cp target/x86_64-apple-darwin/release/sandbox-agent /artifacts/sandbox-agent-x86_64-apple-darwin

+# Default command to show help
 CMD ["ls", "-la", "/artifacts"]
--- a/docker/release/windows.Dockerfile
+++ b/docker/release/windows.Dockerfile
@ -1,11 +1,11 @@
 # syntax=docker/dockerfile:1.10.0
-FROM rust:1.91.0
+FROM rust:1.88.0

-ENV DEBIAN_FRONTEND=noninteractive
+# Install dependencies
 RUN apt-get update && apt-get install -y \
-    llvm-dev \
-    libclang-dev \
-    clang \
+    llvm-14-dev \
+    libclang-14-dev \
+    clang-14 \
    gcc-mingw-w64-x86-64 \
    g++-mingw-w64-x86-64 \
    binutils-mingw-w64-x86-64 \
@ -18,25 +18,34 @@ RUN apt-get update && apt-get install -y \
 RUN update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix && \
    update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix

+# Install target
 RUN rustup target add x86_64-pc-windows-gnu

+# Configure Cargo for Windows cross-compilation
 RUN mkdir -p /root/.cargo && \
    echo '\
 [target.x86_64-pc-windows-gnu]\n\
 linker = "x86_64-w64-mingw32-gcc"\n\
 ' > /root/.cargo/config.toml

+# Set environment variables for cross-compilation
 ENV CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc \
    CC_x86_64_pc_windows_gnu=x86_64-w64-mingw32-gcc \
    CXX_x86_64_pc_windows_gnu=x86_64-w64-mingw32-g++ \
    CC_x86_64-pc-windows-gnu=x86_64-w64-mingw32-gcc \
    CXX_x86_64-pc-windows-gnu=x86_64-w64-mingw32-g++ \
+    LIBCLANG_PATH=/usr/lib/llvm-14/lib \
+    CLANG_PATH=/usr/bin/clang-14 \
    CARGO_INCREMENTAL=0 \
    CARGO_NET_GIT_FETCH_WITH_CLI=true

+# Set working directory
 WORKDIR /build
+
+# Copy the source code
 COPY . .

+# Build for Windows
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
    --mount=type=cache,target=/usr/local/cargo/git \
    --mount=type=cache,target=/build/target \
@ -44,4 +53,5 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
    mkdir -p /artifacts && \
    cp target/x86_64-pc-windows-gnu/release/sandbox-agent.exe /artifacts/sandbox-agent-x86_64-pc-windows-gnu.exe

+# Default command to show help
 CMD ["ls", "-la", "/artifacts"]