Dockerfiles explicitly add adduser and bash

Author: yorickdowne

ethdo/Dockerfile

@@ -4,6 +4,15 @@ FROM wealdtech/ethdo:latest
 ARG USER=ethdo
 ARG UID=1000
 
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y --no-install-recommends \
+  gosu \
+  adduser \
+  bash \
+  jq \
+  && gosu nobody true \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
 # See https://stackoverflow.com/a/55757473/12429735RUN
 RUN adduser \
     --disabled-password \

ethrex/Dockerfile.binary

@@ -15,11 +15,12 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
   ca-certificates \
   tzdata \
   gosu \
+  adduser \
+  bash \
   git \
   git-lfs \
   wget \
   jq \
-  adduser \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

ethrex/Dockerfile.source

@@ -101,10 +101,11 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
   ca-certificates \
   tzdata \
   gosu \
+  adduser \
+  bash \
   git \
   git-lfs \
   wget \
-  adduser \
   jq \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*

ethstaker-deposit-cli/Dockerfile.binary

@@ -10,6 +10,14 @@ ARG SRC_REPO
 ARG USER=depcli
 ARG UID=1000
 
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y --no-install-recommends \
+  gosu \
+  adduser \
+  bash \
+  && gosu nobody true \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
 # See https://stackoverflow.com/a/55757473/12429735RUN
 RUN adduser \
     --disabled-password \
@@ -20,13 +28,6 @@ RUN adduser \
     --uid "${UID}" \
     "${USER}"
 
-RUN set -eux; \
-  apt-get update; \
-  DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y --no-install-recommends gosu; \
-  rm -rf /var/lib/apt/lists/*; \
-# verify that the binary works
-  gosu nobody true
-
 WORKDIR /app
 
 RUN chown -R ${USER}:${USER} /app

ethstaker-deposit-cli/Dockerfile.source

@@ -6,7 +6,11 @@ ARG DOCKER_REPO
 
 RUN mkdir -p /src
 
-RUN apt-get update && apt-get install -y --no-install-recommends bash git
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y --no-install-recommends \
+  bash \
+  git \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 ARG BUILD_TARGET
 ARG SRC_REPO
@@ -32,10 +36,13 @@ EOF
 
 FROM python:3.13-trixie
 
-RUN apt-get update && apt-get install -y --no-install-recommends build-essential bash gosu \
-    && gosu nobody true \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y --no-install-recommends \
+  gosu \
+  adduser \
+  build-essential \
+  && gosu nobody true \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 ARG USER=depcli
 ARG UID=1000

flashbots/Dockerfile.binary

@@ -9,6 +9,7 @@ ARG SRC_REPO
 ARG USER=mev
 ARG UID=10666
 
+# Always included in alpine:3
 # See https://stackoverflow.com/a/55757473/12429735RUN
 RUN adduser \
     --disabled-password \

flashbots/Dockerfile.source

@@ -36,6 +36,7 @@ FROM alpine:3
 ARG USER=mev
 ARG UID=10666
 
+# Always included in alpine:3
 # See https://stackoverflow.com/a/55757473/12429735RUN
 RUN adduser \
     --disabled-password \

geth/Dockerfile.binary

@@ -19,6 +19,7 @@ RUN addgroup \
     --gid "${GID}" \
     "${USER}"
 
+# Always included in alpine:3
 # See https://stackoverflow.com/a/55757473/12429735RUN
 RUN adduser \
     --disabled-password \

geth/Dockerfile.source

@@ -46,6 +46,7 @@ RUN addgroup \
     --gid "${GID}" \
     "${USER}"
 
+# Always included in alpine:3
 # See https://stackoverflow.com/a/55757473/12429735RUN
 RUN adduser \
     --disabled-password \

grandine/Dockerfile.binary

@@ -11,6 +11,19 @@ ARG SRC_REPO
 ARG USER=gdconsensus
 ARG UID=10002
 
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y --no-install-recommends \
+  ca-certificates \
+  tzdata \
+  gosu \
+  adduser \
+  bash \
+  git \
+  git-lfs \
+  curl \
+  && gosu nobody true \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
 # See https://stackoverflow.com/a/55757473/12429735RUN
 RUN adduser \
     --disabled-password \
@@ -21,13 +34,6 @@ RUN adduser \
     --uid "${UID}" \
     "${USER}"
 
-RUN set -eux; \
-        apt-get update; \
-        DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y --no-install-recommends gosu ca-certificates bash tzdata git git-lfs curl; \
-        rm -rf /var/lib/apt/lists/*; \
-# verify that the binary works
-        gosu nobody true
-
 # Create data mount point with permissions
 RUN mkdir -p /var/lib/grandine/ee-secret && chown -R ${USER}:${USER} /var/lib/grandine \
 && chmod -R 700 /var/lib/grandine && chmod 777 /var/lib/grandine/ee-secret