reduce dockerfile layers

Author: willcl-ark

src/templates/Dockerfile

@@ -7,21 +7,17 @@ ARG REPO
 ARG BRANCH
 ARG BITCOIN_URL
 
-# Base requirements
-RUN apt-get update && apt-get install -y --no-install-recommends \
+# install or build
+RUN set -ex \
+    && apt-get update && apt-get install -y --no-install-recommends \
         ca-certificates \
         wget \
-    && apt-get clean
-
-# Download binary
-RUN if [ -n "${BITCOIN_URL}" ]; then \
+    && if [ -n "${BITCOIN_URL}" ]; then \
         wget "${BITCOIN_URL}/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-${ARCH}-linux-gnu.tar.gz"; \
         tar -xzf "bitcoin-${BITCOIN_VERSION}-${ARCH}-linux-gnu.tar.gz" -C /usr/local --strip-components=1; \
-    fi;
-
-# Extra requirements to build from source
-RUN if [ -n "${REPO}" ]; then \
-        apt-get update && apt-get install -y \
+    fi \
+    && if [ -n "${REPO}" ]; then \
+        apt-get install -y \
             automake \
             autotools-dev \
             build-essential \
@@ -35,12 +31,7 @@ RUN if [ -n "${REPO}" ]; then \
             libzmq3-dev \
             libqrencode-dev \
             libsqlite3-dev \
-            pkg-config \
-        && apt-get clean; \
-    fi;
-
-# Build from source
-RUN if [ -n "${REPO}" ]; then \
+            pkg-config; \
         mkdir build; \
         cd /build; \
         git clone --depth 1 --branch "${BRANCH}" "https://github.com/${REPO}"; \
@@ -54,12 +45,9 @@ RUN if [ -n "${REPO}" ]; then \
             --enable-suppress-external-warnings; \
         make -j$(nproc); \
         make install; \
-    fi;
+    fi
 
-RUN rm -f /usr/local/bin/bitcoin-qt
-RUN rm -f /usr/local/bin/test_bitcoin*
-
-# shrink image size a bit with a second stage
+# shrink image size with a second stage
 FROM debian:bookworm-slim
 
 ARG UID=3338
@@ -68,42 +56,37 @@ ARG REPO
 # env var overrides
 ENV UID=$UID
 ENV GID=$GID
-
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 
-RUN groupadd --gid ${GID} bitcoin \
-  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
-  && apt-get update && apt-get install -y --no-install-recommends \
+RUN set -ex \
+    && groupadd --gid ${GID} bitcoin \
+    && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
         gosu \
         tor \
-        iproute2; \
-    apt-get clean;
-
-# libs needed to run source-build without depends
-RUN if [ -n "${REPO}" ]; then \
-        apt-get update && apt-get install -y \
+        iproute2 \
+    && if [ -n "${REPO}" ]; then \
+        apt-get install -y --no-install-recommends \
             libboost-dev \
             libevent-dev \
             libdb5.3++-dev \
             libminiupnpc-dev \
             libnatpmp-dev \
             libzmq3-dev \
             libqrencode-dev \
-            libsqlite3-dev \
-        && apt-get clean; \
-    fi;
-
-COPY --from=builder /usr/local/bin/bitcoin* /usr/local/bin/
+            libsqlite3-dev; \
+    fi \
+    && apt-get clean \
+    && rm -rf /var/cache/apt/* /var/lib/apt/lists/*
 
+COPY --from=builder /usr/local/bin/bitcoind /usr/local/bin/bitcoin-cli /usr/local/bin/
 COPY docker-entrypoint.sh /entrypoint.sh
 COPY tor-keys/* /home/debian-tor/.tor/keys/
 
 VOLUME ["/home/bitcoin/.bitcoin"]
-
 EXPOSE 8332 8333 18332 18333 18443 18444 38333 38332
 
 ENTRYPOINT ["/entrypoint.sh"]
-
 RUN bitcoind -version | grep -E "Bitcoin Core( Daemon)? version v${BITCOIN_VERSION}"
-
 CMD ["bitcoind"]