polkadot builder image -> ubuntu

zombienet/docker/Makefile

@@ -10,10 +10,14 @@ GOOGLE_APPLICATION_CREDENTIALS ?=
 PLATFORM ?= linux/amd64
 ARCHITECTURE ?= amd64
 
+# Generated versions
+OS_IMAGE ?= $(OS_IMAGE_NAME):$(OS_IMAGE_TAG)@sha256:$(OS_IMAGE_HASH)
+OS_IMAGE_TAG_WITH_HASH := $(OS_IMAGE_TAG)@sha256:$(OS_IMAGE_HASH)
+OS_IMAGE_SHORT_HASH := $(shell echo $(OS_IMAGE_HASH) | cut -c1-7)
+
 # polkadot_builder Variables
 POLKADOT_SDK_TAG ?=
-RUST_IMAGE=rust
-RUST_IMAGE_TAG=1.81-slim-bookworm
+RUST_VERSION ?= 1.81.0
 SCCACHE_VERSION ?= 0.7.4
 BUILDER_LATEST_TAG ?= latest
 TESTER_LATEST_TAG ?= latest
@@ -110,8 +114,9 @@ polkadot_builder:
 		-t $(DOCKER_REGISTRY_PATH)polkadot_builder:$$POLKADOT_SDK_RELEASE \
 		-t $(DOCKER_REGISTRY_PATH)polkadot_builder:$(BUILDER_LATEST_TAG) \
 		-f polkadot_builder.Dockerfile \
-		--build-arg RUST_IMAGE=$(RUST_IMAGE) \
-		--build-arg RUST_IMAGE_TAG=$(RUST_IMAGE_TAG) \
+		--build-arg RUST_VERSION=$(RUST_VERSION) \
+		--build-arg BASE_IMAGE=$(OS_IMAGE_NAME) \
+		--build-arg BASE_IMAGE_TAG=$(OS_IMAGE_TAG_WITH_HASH) \
 		--build-arg SCCACHE_VERSION=$(SCCACHE_VERSION) \
 		--build-arg POLKADOT_SDK_RELEASE=$$POLKADOT_SDK_RELEASE . ; \
 	else \

zombienet/docker/polkadot_builder.Dockerfile

@@ -1,13 +1,14 @@
 ARG AUTHOR="[email protected] <Kirill Azovtsev>"
 
+ARG BASE_IMAGE
+ARG BASE_IMAGE_TAG
 ARG ARCHITECTURE=x86_64
-ARG SCCACHE_VERSION
 
+ARG SCCACHE_VERSION
 ARG POLKADOT_SDK_RELEASE
-ARG RUST_IMAGE
-ARG RUST_IMAGE_TAG
+ARG RUST_VERSION
 
-FROM ${RUST_IMAGE}:${RUST_IMAGE_TAG} AS polkadot-sdk-builder
+FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS polkadot-sdk-builder
 
 ARG AUTHOR
 ENV AUTHOR=${AUTHOR}
@@ -17,23 +18,31 @@ LABEL org.opencontainers.image.description="Polkadot SDK builder image"
 WORKDIR /home/nonroot/
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+COPY install_packages /usr/sbin/install_packages
+RUN chmod 0755 /usr/sbin/install_packages
+
 ARG POLKADOT_SDK_RELEASE
 ENV POLKADOT_SDK_RELEASE=$POLKADOT_SDK_RELEASE
 
-RUN apt-get update && \
-    apt-get install --no-install-recommends --yes \
-            git \
-            wget \
-            openssl \
-            ca-certificates \
-            build-essential \
-            clang \
-            protobuf-compiler \
-            libprotobuf-dev && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN rustup default stable &&  \
+RUN install_packages \
+      git \
+      wget \
+      curl \
+      openssl \
+      ca-certificates \
+      build-essential \
+      clang \
+      protobuf-compiler \
+      libprotobuf-dev
+
+ARG RUST_VERSION
+ENV RUST_VERSION=${RUST_VERSION}
+ENV RUSTUP_HOME=/root/.rustup
+ENV CARGO_HOME=/root/.cargo
+ENV PATH="${CARGO_HOME}/bin:${PATH}"
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST_VERSION}
+
+RUN rustup default ${RUST_VERSION} &&  \
     rustup target add wasm32-unknown-unknown &&  \
     rustup component add rust-src
 
@@ -44,10 +53,12 @@ ENV SCCACHE_VERSION=$SCCACHE_VERSION
 ARG ARCHITECTURE
 ENV ARCHITECTURE=$ARCHITECTURE
 
+RUN mkdir -p /tmp/download
+
+WORKDIR /tmp/download
+
 # Version >0.7.4 has a bug - work with GCS is broken
-RUN mkdir -p /tmp/download && \
-    cd /tmp/download && \
-    wget -q -O sccache.tar.gz https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERSION}/sccache-v${SCCACHE_VERSION}-${ARCHITECTURE}-unknown-linux-musl.tar.gz && \
+RUN wget -q -O sccache.tar.gz https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERSION}/sccache-v${SCCACHE_VERSION}-${ARCHITECTURE}-unknown-linux-musl.tar.gz && \
     tar xzf sccache.tar.gz && \
     ls -la && \
     mv sccache-v*/sccache /usr/local/bin/sccache && \