feat(): larger common prefixes of Dockerfiles to speed up building

dbapi/Dockerfile

@@ -2,13 +2,13 @@ FROM postgres:13-alpine
 
 RUN apk add --no-cache pwgen
 
-ADD docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
-
 USER postgres
 
 # mountable storage
 VOLUME /var/lib/postgresql/data
 
-COPY entrypoint-wrapper.sh /usr/local/bin/
 ENTRYPOINT ["entrypoint-wrapper.sh"]
 CMD ["postgres"]
+
+COPY entrypoint-wrapper.sh /usr/local/bin/
+ADD docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

dbmaster/Dockerfile

@@ -2,13 +2,13 @@ FROM postgres:13-alpine
 
 RUN apk add --no-cache pwgen
 
-ADD docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
-
 USER postgres
 
 # mountable storage
 VOLUME /var/lib/postgresql/data
 
-COPY entrypoint-wrapper.sh /usr/local/bin/
 ENTRYPOINT ["entrypoint-wrapper.sh"]
 CMD ["postgres"]
+
+COPY entrypoint-wrapper.sh /usr/local/bin/
+ADD docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

nslord/Dockerfile

@@ -1,33 +1,29 @@
 FROM ubuntu:jammy
 
-RUN apt-get update && apt-get install -y \
-		dnsutils \
-		net-tools \
-		dirmngr gnupg \
-		faketime \
-	--no-install-recommends && apt-get clean && rm -rf /var/lib/apt/lists/*
+COPY ./entrypoint.sh /root/
+CMD ["/root/entrypoint.sh"]
 
-RUN echo 'deb [arch=amd64] http://repo.powerdns.com/ubuntu jammy-auth-48 main' \
-      >> /etc/apt/sources.list \
- && echo 'Package: pdns-*' \
-      > /etc/apt/preferences.d/pdns \
- && echo 'Pin: origin repo.powerdns.com' \
-      >> /etc/apt/preferences.d/pdns \
- && echo 'Pin-Priority: 600' \
-      >> /etc/apt/preferences.d/pdns
+RUN apt-get update && apt-get install -y \
+    dnsutils \
+    iptables \
+    net-tools \
+    dirmngr gnupg \
+    # credentials management via envsubst
+    && apt-get -y install gettext-base \
+    --no-install-recommends && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN set -ex \
-	&& apt-key adv --keyserver keyserver.ubuntu.com --recv 0x1B0C6205FD380FBB \
-	&& apt-get update \
-	&& apt-get install -y pdns-server pdns-backend-mysql \
-	# credentials management via envsubst
-	&& apt-get -y install gettext-base \
-	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists/*
+    && echo 'deb [arch=amd64] http://repo.powerdns.com/ubuntu jammy-auth-48 main' \
+        >> /etc/apt/sources.list \
+    && echo 'Package: pdns-*' > /etc/apt/preferences.d/pdns \
+    && echo 'Pin: origin repo.powerdns.com' >> /etc/apt/preferences.d/pdns \
+    && echo 'Pin-Priority: 600' >> /etc/apt/preferences.d/pdns \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv 0x1B0C6205FD380FBB
 
-RUN rm -rf /etc/powerdns/
-COPY conf/ /etc/powerdns/
+RUN apt-get update \
+    && apt-get install -y pdns-server pdns-backend-mysql faketime \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /etc/powerdns/
 
-COPY ./entrypoint.sh /root/
-
-CMD ["/root/entrypoint.sh"]
+COPY conf/ /etc/powerdns/

nsmaster/Dockerfile

@@ -1,35 +1,29 @@
 FROM ubuntu:jammy
 
-RUN apt-get update && apt-get install -y \
-		dnsutils \
-		iptables \
-		net-tools \
-		dirmngr gnupg \
-	--no-install-recommends && apt-get clean && rm -rf /var/lib/apt/lists/*
+COPY ./entrypoint.sh /root/
+CMD ["/root/entrypoint.sh"]
 
-RUN echo 'deb [arch=amd64] http://repo.powerdns.com/ubuntu jammy-auth-48 main' \
-      >> /etc/apt/sources.list \
- && echo 'Package: pdns-*' \
-      > /etc/apt/preferences.d/pdns \
- && echo 'Pin: origin repo.powerdns.com' \
-      >> /etc/apt/preferences.d/pdns \
- && echo 'Pin-Priority: 600' \
-      >> /etc/apt/preferences.d/pdns
+RUN apt-get update && apt-get install -y \
+    dnsutils \
+    iptables \
+    net-tools \
+    dirmngr gnupg \
+    # credentials management via envsubst
+    && apt-get -y install gettext-base \
+    --no-install-recommends && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN set -ex \
-	&& apt-key adv --keyserver keyserver.ubuntu.com --recv 0x1B0C6205FD380FBB \
-	&& apt-get update \
-	&& apt-get install -y pdns-server pdns-backend-pgsql postgresql-client-14 \
-	# credentials management via envsubst
-	&& apt-get -y install gettext-base \
-	# VPN route
-	&& apt-get -y install iproute2 \
-	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists/*
+    && echo 'deb [arch=amd64] http://repo.powerdns.com/ubuntu jammy-auth-48 main' \
+        >> /etc/apt/sources.list \
+    && echo 'Package: pdns-*' > /etc/apt/preferences.d/pdns \
+    && echo 'Pin: origin repo.powerdns.com' >> /etc/apt/preferences.d/pdns \
+    && echo 'Pin-Priority: 600' >> /etc/apt/preferences.d/pdns \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv 0x1B0C6205FD380FBB
 
-RUN rm -rf /etc/powerdns/
-COPY conf/ /etc/powerdns/
+RUN apt-get update \
+    && apt-get install -y pdns-server pdns-backend-pgsql postgresql-client-14 iproute2 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /etc/powerdns/
 
-COPY ./entrypoint.sh /root/
-
-CMD ["/root/entrypoint.sh"]
+COPY conf/ /etc/powerdns/