From 32517e35ca36857e5148e7df28a962f7321350d5 Mon Sep 17 00:00:00 2001 From: Kirill Azovtsev Date: Sun, 16 Jun 2024 20:14:57 +0300 Subject: [PATCH] testing images for zombie_tester --- zombienet/docker/tester.Dockerfile | 2 +- zombienet/docker/zombie_builder.Dockerfile | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/zombienet/docker/tester.Dockerfile b/zombienet/docker/tester.Dockerfile index 8626279e9c..c4d92877a1 100644 --- a/zombienet/docker/tester.Dockerfile +++ b/zombienet/docker/tester.Dockerfile @@ -4,7 +4,7 @@ ARG KAGOME_IMAGE FROM $KAGOME_IMAGE as kagome -FROM qdrvm/zombie-builder:$POLKADOT_SDK_RELEASE AS tester +FROM qdrvm/zombie-builder:$POLKADOT_SDK_RELEASE-testing AS tester ARG BRANCH_NAME ENV BRANCH_NAME=${BRANCH_NAME} diff --git a/zombienet/docker/zombie_builder.Dockerfile b/zombienet/docker/zombie_builder.Dockerfile index ef96b951f3..d87b8fa151 100644 --- a/zombienet/docker/zombie_builder.Dockerfile +++ b/zombienet/docker/zombie_builder.Dockerfile @@ -6,8 +6,13 @@ ARG ZOMBIENET_RELEASE ARG BASE_IMAGE=bitnami/minideb@sha256:6cc3baf349947d587a9cd4971e81ff3ffc0d17382f2b5b6de63d6542bff10c16 ARG RUST_IMAGE=rust:1.79-slim-bookworm +ARG AUTHOR="zak@zergling.ru " + FROM ${RUST_IMAGE} AS polkadot-sdk-builder +LABEL org.opencontainers.image.authors="${AUTHOR}" +LABEL org.opencontainers.image.description="Polkadot SDK builder image" + WORKDIR /home/nonroot/ ARG POLKADOT_SDK_RELEASE @@ -15,7 +20,9 @@ ENV POLKADOT_SDK_RELEASE=$POLKADOT_SDK_RELEASE RUN apt-get update && \ apt-get install --no-install-recommends --yes \ - git && \ + git \ + openssl \ + libssl-dev && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -43,6 +50,9 @@ RUN echo "Listing files in /home/nonroot/polkadot-sdk/target: " && \ FROM ${BASE_IMAGE} as zombienet-bin +LABEL org.opencontainers.image.authors="${AUTHOR}" +LABEL org.opencontainers.image.description="Zombienet image" + ARG ZOMBIENET_RELEASE ENV ZOMBIENET_RELEASE=$ZOMBIENET_RELEASE @@ -92,6 +102,9 @@ RUN ./polkadot --version && \ FROM zombienet-bin as final +LABEL org.opencontainers.image.authors="${AUTHOR}" +LABEL org.opencontainers.image.description="Zombienet Builder image" + ENV PATH="/home/nonroot/bin:${PATH}" ARG ZOMBIENET_RELEASE ENV ZOMBIENET_RELEASE=$ZOMBIENET_RELEASE