From fd44d5a2ef75288017cb84192e94c86ce3b6c6fd Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Thu, 31 Mar 2022 01:33:32 +0200
Subject: [PATCH] Have COPY statements at the end of Dockerfiles

---
 Dockerfiles/mods/Dockerfile-5.2              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-5.3              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-5.4              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-5.5              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-5.6              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-7.0              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-7.1              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-7.2              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-7.3              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-7.4              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-8.0              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-8.1              | 26 ++++++++++----------
 Dockerfiles/mods/Dockerfile-8.2              | 26 ++++++++++----------
 build/ansible/DOCKERFILES/Dockerfile-mods.j2 | 26 ++++++++++----------
 14 files changed, 182 insertions(+), 182 deletions(-)

diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2
index 2217975..c271634 100644
--- a/Dockerfiles/mods/Dockerfile-5.2
+++ b/Dockerfiles/mods/Dockerfile-5.2
@@ -583,18 +583,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.2-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -630,7 +619,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 ###
 ### Verify
diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3
index debd030..0e8707e 100644
--- a/Dockerfiles/mods/Dockerfile-5.3
+++ b/Dockerfiles/mods/Dockerfile-5.3
@@ -692,18 +692,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.3-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -743,7 +732,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- oci8 ----------
diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4
index 0a77813..f6d1506 100644
--- a/Dockerfiles/mods/Dockerfile-5.4
+++ b/Dockerfiles/mods/Dockerfile-5.4
@@ -703,18 +703,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.4-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -754,7 +743,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- oci8 ----------
diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5
index 9bb8ef8..868118d 100644
--- a/Dockerfiles/mods/Dockerfile-5.5
+++ b/Dockerfiles/mods/Dockerfile-5.5
@@ -741,18 +741,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.5-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -794,7 +783,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6
index 131d642..7561272 100644
--- a/Dockerfiles/mods/Dockerfile-5.6
+++ b/Dockerfiles/mods/Dockerfile-5.6
@@ -760,18 +760,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.6-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -813,7 +802,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0
index 6a1e032..3d4612f 100644
--- a/Dockerfiles/mods/Dockerfile-7.0
+++ b/Dockerfiles/mods/Dockerfile-7.0
@@ -846,18 +846,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.0-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -902,7 +891,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1
index 750a31d..e007908 100644
--- a/Dockerfiles/mods/Dockerfile-7.1
+++ b/Dockerfiles/mods/Dockerfile-7.1
@@ -854,18 +854,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.1-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -910,7 +899,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
index 83eb3d0..6c2c6e6 100644
--- a/Dockerfiles/mods/Dockerfile-7.2
+++ b/Dockerfiles/mods/Dockerfile-7.2
@@ -857,18 +857,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.2-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -913,7 +902,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
index d87ff8c..e9b3f46 100644
--- a/Dockerfiles/mods/Dockerfile-7.3
+++ b/Dockerfiles/mods/Dockerfile-7.3
@@ -847,18 +847,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.3-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -902,7 +891,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4
index fcf5a7f..03c7fcd 100644
--- a/Dockerfiles/mods/Dockerfile-7.4
+++ b/Dockerfiles/mods/Dockerfile-7.4
@@ -833,18 +833,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.4-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -888,7 +877,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0
index ea34af4..c19a05e 100644
--- a/Dockerfiles/mods/Dockerfile-8.0
+++ b/Dockerfiles/mods/Dockerfile-8.0
@@ -788,18 +788,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.0-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -843,7 +832,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1
index 7954644..22d181e 100644
--- a/Dockerfiles/mods/Dockerfile-8.1
+++ b/Dockerfiles/mods/Dockerfile-8.1
@@ -763,18 +763,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.1-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -817,7 +806,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
diff --git a/Dockerfiles/mods/Dockerfile-8.2 b/Dockerfiles/mods/Dockerfile-8.2
index c5f955b..aef9e30 100644
--- a/Dockerfiles/mods/Dockerfile-8.2
+++ b/Dockerfiles/mods/Dockerfile-8.2
@@ -750,18 +750,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.2-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -803,7 +792,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2
index 61d5a4b..a0abf7f 100644
--- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2
@@ -342,18 +342,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM {{ php_version }}-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -388,7 +377,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 {# Loop over enabled extensions #}
 {%- set post_commands = {} -%}