Replace minideb with the official Rust image.

qdrvm · Jun 16, 2024 · 4b0c825 · 4b0c825
1 parent d5fd4ac
commit 4b0c825
Showing 1 changed file with 14 additions and 47 deletions.
diff --git a/zombienet/docker/zombie_builder.Dockerfile b/zombienet/docker/zombie_builder.Dockerfile
@@ -4,58 +4,25 @@ ARG POLKADOT_SDK_RELEASE
 ARG ZOMBIENET_RELEASE
 
 ARG BASE_IMAGE=bitnami/minideb@sha256:6cc3baf349947d587a9cd4971e81ff3ffc0d17382f2b5b6de63d6542bff10c16
+ARG RUST_IMAGE=rust:1.79-slim-bookworm
 
-# bookworm
-FROM ${BASE_IMAGE} as polkadot-sdk-builder
+FROM ${RUST_IMAGE} AS polkadot-sdk-builder
 
-USER root
+WORKDIR /home/nonroot/
 
 ARG POLKADOT_SDK_RELEASE
 ENV POLKADOT_SDK_RELEASE=$POLKADOT_SDK_RELEASE
 
-WORKDIR /home/nonroot/
-
-RUN install_packages  \
-        bash \
-        git  \
-        ssh  \
-        curl  \
-        nano  \
-        build-essential  \
-        protobuf-compiler  \
-        libprotobuf-dev  \
-        time  \
-        clang  \
-        ca-certificates  \
-        openssl
-
-SHELL ["/bin/bash", "-c"]
-
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-
-ENV RUSTUP_HOME="/opt/rust"
-ENV CARGO_HOME="/opt/cargo"
-ENV PATH="/root/.cargo/bin:${PATH}"
+RUN apt-get update && \
+    apt-get install --no-install-recommends --yes \
+            git && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN rustup default stable &&  \
     rustup target add wasm32-unknown-unknown &&  \
     rustup component add rust-src
 
-RUN groupadd --gid 10001 nonroot && \
-    useradd  --home-dir /home/nonroot \
-             --create-home \
-             --shell /bin/bash \
-             --gid nonroot \
-             --groups nonroot \
-             --uid 10000 nonroot
-
-
-FROM polkadot-sdk-builder AS polkadot-sdk-bin
-
-ENV RUSTUP_HOME="/opt/rust"
-ENV CARGO_HOME="/opt/cargo"
-ENV PATH="/root/.cargo/bin:${PATH}"
-
 RUN git clone --depth 1 --branch $POLKADOT_SDK_RELEASE https://github.com/paritytech/polkadot-sdk.git
 
 WORKDIR /home/nonroot/polkadot-sdk/
@@ -70,7 +37,8 @@ RUN cargo build --profile testnet  \
       -p polkadot-test-malus \
       -p test-parachain-undying-collator
 
-RUN find /home/nonroot/polkadot-sdk/target/ -maxdepth 2 -print
+RUN echo "Listing files in /home/nonroot/polkadot-sdk/target: " && \
+    find /home/nonroot/polkadot-sdk/target/ -maxdepth 2 -print
 
 
 FROM ${BASE_IMAGE} as zombienet-bin
@@ -108,11 +76,9 @@ RUN zombienet setup -y polkadot polkadot-parachain; \
         exit $EXIT_CODE; \
     fi;
 
-COPY --from=polkadot-sdk-bin /home/nonroot/polkadot-sdk/target/testnet/malus /home/nonroot/bin
-COPY --from=polkadot-sdk-bin /home/nonroot/polkadot-sdk/target/testnet/adder-collator /home/nonroot/bin
-COPY --from=polkadot-sdk-bin /home/nonroot/polkadot-sdk/target/testnet/undying-collator /home/nonroot/bin
-#COPY polkadot-sdk-versions.txt /home/nonroot/polkadot-sdk-versions.txt
-#COPY zombienet-versions.txt /home/nonroot/zombienet-versions.txt
+COPY --from=polkadot-sdk-builder /home/nonroot/polkadot-sdk/target/testnet/malus /home/nonroot/bin
+COPY --from=polkadot-sdk-builder /home/nonroot/polkadot-sdk/target/testnet/adder-collator /home/nonroot/bin
+COPY --from=polkadot-sdk-builder /home/nonroot/polkadot-sdk/target/testnet/undying-collator /home/nonroot/bin
 
 RUN ./polkadot --version && \
     ./polkadot-parachain --version && \
@@ -123,6 +89,7 @@ RUN ./polkadot --version && \
     ./adder-collator --version && \
     ./undying-collator --version
 
+
 FROM zombienet-bin as final
 
 ENV PATH="/home/nonroot/bin:${PATH}"