From 5e7974ead64cc666fedccc4700842282b2d38f1e Mon Sep 17 00:00:00 2001
From: Trevor Benson <trevor.benson@scality.com>
Date: Wed, 18 Oct 2023 07:54:54 -0700
Subject: [PATCH] Refactor Dockerfile.ci for smaller sizes #1272

---
 mithril-aggregator/Dockerfile.ci | 25 ++++++++++++++-----------
 mithril-client/Dockerfile.ci     | 11 ++++++++---
 mithril-signer/Dockerfile.ci     | 25 ++++++++++++++-----------
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/mithril-aggregator/Dockerfile.ci b/mithril-aggregator/Dockerfile.ci
index e031780acff..3317b70a530 100644
--- a/mithril-aggregator/Dockerfile.ci
+++ b/mithril-aggregator/Dockerfile.ci
@@ -3,24 +3,27 @@
 # on a debian-compatible x86-64 environment
 FROM debian:11-slim
 
-# Args
-ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.2/cardano-node-8.1.2-linux.tar.gz
+# Create appuser
+RUN adduser --no-create-home --disabled-password appuser
+
+# Precreate workdir
+RUN mkdir -p /app/bin
 
 # Upgrade
-RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && rm -rf /var/lib/apt/lists/*
+RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Create appuser
-RUN adduser --no-create-home --disabled-password appuser
+# Install cardano-cli
+ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.2/cardano-node-8.1.2-linux.tar.gz
+RUN wget -nv -O cardano-bin.tar.gz $CARDANO_BIN_URL \
+    && tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin \
+    && /app/bin/cardano-cli --version \
+    && rm -f cardano-bin.tar.gz
 
 # Copy the executable
 COPY mithril-aggregator/mithril-aggregator /app/bin/mithril-aggregator
-COPY mithril-aggregator/config /app/config
 
-# Install cardano-cli
-RUN wget -nv -O cardano-bin.tar.gz $CARDANO_BIN_URL
-RUN tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin
-RUN /app/bin/cardano-cli --version
-RUN rm -f cardano-bin.tar.gz
+# Copy the config files
+COPY mithril-aggregator/config /app/config
 
 #Workdir
 WORKDIR /app/
diff --git a/mithril-client/Dockerfile.ci b/mithril-client/Dockerfile.ci
index eb1761bc4d1..f68e0ba479a 100644
--- a/mithril-client/Dockerfile.ci
+++ b/mithril-client/Dockerfile.ci
@@ -3,14 +3,19 @@
 # on a debian-compatible x86-64 environment
 FROM debian:11-slim
 
-# Upgrade
-RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && rm -rf /var/lib/apt/lists/*
-
 # Create appuser
 RUN adduser --disabled-password appuser
 
+# Precreate workdir
+RUN mkdir -p /app/bin
+
+# Upgrade
+RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && apt-get clean && rm -rf /var/lib/apt/lists/*
+
 # Copy the executable
 COPY mithril-client/mithril-client /app/bin/mithril-client
+
+# Copy the config files
 COPY mithril-client/config /app/config
 
 # Workdir
diff --git a/mithril-signer/Dockerfile.ci b/mithril-signer/Dockerfile.ci
index 345adc88063..50fe855ea41 100644
--- a/mithril-signer/Dockerfile.ci
+++ b/mithril-signer/Dockerfile.ci
@@ -3,24 +3,27 @@
 # on a debian-compatible x86-64 environment
 FROM debian:11-slim
 
-# Args
-ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.2/cardano-node-8.1.2-linux.tar.gz
+# Create appuser
+RUN adduser --no-create-home --disabled-password appuser
+
+# Precreate workdir
+RUN mkdir -p /app/bin
 
 # Upgrade
-RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && rm -rf /var/lib/apt/lists/*
+RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Create appuser
-RUN adduser --no-create-home --disabled-password appuser
+# Install cardano-cli
+ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.2/cardano-node-8.1.2-linux.tar.gz
+RUN wget -nv -O cardano-bin.tar.gz $CARDANO_BIN_URL \
+    && tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin \
+    && /app/bin/cardano-cli --version \
+    && rm -f cardano-bin.tar.gz
 
 # Copy the executable
 COPY mithril-signer/mithril-signer /app/bin/mithril-signer
-COPY mithril-signer/config /app/config
 
-# Install cardano-cli
-RUN wget -nv -O cardano-bin.tar.gz $CARDANO_BIN_URL
-RUN tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin
-RUN /app/bin/cardano-cli --version
-RUN rm -f cardano-bin.tar.gz
+# Copy the config files
+COPY mithril-signer/config /app/config
 
 # Workdir
 WORKDIR /app/