From 7e38bbf828cd9fc3853903d184d62a6272f0a32a Mon Sep 17 00:00:00 2001 From: DJO <790521+Alenar@users.noreply.github.com> Date: Tue, 11 Jul 2023 16:11:47 +0200 Subject: [PATCH] Simplify dev dockerfiles by using rust base images --- mithril-aggregator/Dockerfile | 12 +----------- mithril-client/Dockerfile | 12 +----------- mithril-signer/Dockerfile | 12 +----------- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/mithril-aggregator/Dockerfile b/mithril-aggregator/Dockerfile index 7d25626af7c..54715a6148c 100644 --- a/mithril-aggregator/Dockerfile +++ b/mithril-aggregator/Dockerfile @@ -1,17 +1,7 @@ ############################### # STEP 1: build rust executable ############################### -FROM ubuntu:20.04 AS rustbuilder - -ENV DEBIAN_FRONTEND noninteractive - -# Upgrade and install build base -RUN apt-get update && apt-get install -y libssl-dev curl wget build-essential pkg-config make m4 - -# Install Rust -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -ENV PATH="/root/.cargo/bin:${PATH}" -RUN cargo --version +FROM rust:bullseye AS rustbuilder # Create appuser RUN adduser --no-create-home --disabled-password appuser diff --git a/mithril-client/Dockerfile b/mithril-client/Dockerfile index 441ca8ea85a..a5af043b1b7 100644 --- a/mithril-client/Dockerfile +++ b/mithril-client/Dockerfile @@ -1,17 +1,7 @@ ############################### # STEP 1: build rust executable ############################### -FROM ubuntu:20.04 AS rustbuilder - -ENV DEBIAN_FRONTEND noninteractive - -# Upgrade and install build base -RUN apt-get update && apt-get install -y libssl-dev curl wget build-essential pkg-config make m4 - -# Install Rust -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -ENV PATH="/root/.cargo/bin:${PATH}" -RUN cargo --version +FROM rust:bullseye AS rustbuilder # Create appuser RUN adduser --no-create-home --disabled-password appuser diff --git a/mithril-signer/Dockerfile b/mithril-signer/Dockerfile index fb958517dce..2da23f593fe 100644 --- a/mithril-signer/Dockerfile +++ b/mithril-signer/Dockerfile @@ -1,17 +1,7 @@ ############################### # STEP 1: build rust executable ############################### -FROM ubuntu:20.04 AS rustbuilder - -ENV DEBIAN_FRONTEND noninteractive - -# Upgrade and install build base -RUN apt-get update && apt-get install -y libssl-dev curl wget build-essential pkg-config make m4 - -# Install Rust -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -ENV PATH="/root/.cargo/bin:${PATH}" -RUN cargo --version +FROM rust:bullseye AS rustbuilder # Create appuser RUN adduser --no-create-home --disabled-password appuser