Fix building docker image (#879)

Author: LGLO

dev/docker/Dockerfile

@@ -1,15 +1,10 @@
 FROM partner-chains-node-builder:latest AS builder
+FROM partner-chains-node-runner:latest
 
-FROM docker.io/library/ubuntu:20.04
-COPY --from=builder /partner-chains-node/docker-build/target/release/partner-chains-demo-node /usr/local/bin/partner-chains-node
+COPY --from=builder /partner-chains-node/partner-chains-demo-node /usr/local/bin/partner-chains-node
 
-RUN useradd -m -u 1000 -U -s /bin/sh -d /substrate substrate && \
-	mkdir -p /data /substrate/.local/share/partner-chains-node && \
-	chown -R substrate:substrate /data && \
-	ln -s /data /substrate/.local/share/partner-chains-node && \
-	# Sanity checks
-	ldd /usr/local/bin/partner-chains-node && \
-	/usr/local/bin/partner-chains-node --version
+RUN /usr/local/bin/partner-chains-node --version
+RUN chown substrate:substrate /usr/local/bin/partner-chains-node && chmod +x /usr/local/bin/partner-chains-node
 
 USER substrate
 

dev/docker/build-images-local.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
 # This script has to be executed from the root of the repository to enable proper context for the Docker build. `./dev/docker/build-images-local.sh`
-docker build --pull -f dev/docker/builder.Dockerfile -t "partner-chains-node-builder:latest" --ssh default . && \
-docker build -f dev/docker/Dockerfile -t partner-chains-node:latest dev/docker
+docker build --platform linux/amd64 --pull -f dev/docker/builder.Dockerfile -t "partner-chains-node-builder:latest" --ssh default . && \
+docker build --platform linux/amd64 --pull -f dev/docker/runner.Dockerfile -t "partner-chains-node-runner:latest" --ssh default . && \
+docker build --platform linux/amd64 -f dev/docker/Dockerfile -t partner-chains-node:latest dev/docker

dev/docker/builder.Dockerfile

@@ -1,8 +1,10 @@
-FROM docker.io/paritytech/ci-unified:bullseye-1.81.0-2024-11-19-v202411281558 AS builder
+FROM docker.io/paritytech/ci-unified:latest AS builder
 
 WORKDIR /partner-chains-node
 COPY . /partner-chains-node
 
-RUN mkdir -p docker-build/cargo-home || echo "cargo-home already exists" && \
-	export CARGO_HOME="$(pwd)/docker-build/cargo-home"
-RUN --mount=type=ssh cargo build --release --target-dir=docker-build/target
+ENV RUSTUP_HOME="/partner-chains-node/docker-build/rustup-home"
+ENV CARGO_HOME="/partner-chains-node/docker-build/cargo-home"
+RUN --mount=type=cache,target=/partner-chains-node/docker-build \
+	cargo build --release --target-dir=docker-build/target && \
+	cp docker-build/target/release/partner-chains-demo-node /partner-chains-node/partner-chains-demo-node

dev/docker/runner.Dockerfile

@@ -0,0 +1,21 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && apt-get install -y \
+	ca-certificates \
+	libgcc-s1 \
+	libstdc++6 \
+	libc6 \
+	libssl3 \
+	zlib1g \
+	libgomp1 \
+	curl \
+	wget \
+	vim \
+	dnsutils \
+	jq \
+	htop
+
+RUN useradd -m -u 1010 -U -s /bin/sh -d /substrate substrate \
+	&& mkdir -p /data /substrate/.local/share/partner-chains-node \
+	&& chown -R substrate:substrate /data /substrate \
+	&& ln -s /data /substrate/.local/share/partner-chains-node