Skip to content

Commit fd44d5a

Browse files
cytopiacytopia
committed
Have COPY statements at the end of Dockerfiles
1 parent e9852d2 commit fd44d5a

14 files changed

Lines changed: 182 additions & 182 deletions

‎Dockerfiles/mods/Dockerfile-5.2‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -583,18 +583,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.2-mods"
583583

584584

585585
###
586-
### Copy artifacts from builder
587-
###
588-
ARG EXT_DIR
589-
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
590-
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
591-
COPY --from=builder /usr/local/bin/ /usr/local/bin/
592-
COPY --from=builder /usr/local/lib/ /usr/local/lib/
593-
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
594-
595-
596-
###
597-
### Install
586+
### Install runtime libraries
598587
###
599588
RUN set -eux \
600589
&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -630,7 +619,18 @@ RUN set -eux \
630619

631620

632621
###
633-
### Post Install
622+
### Copy artifacts from builder
623+
###
624+
ARG EXT_DIR
625+
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
626+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
627+
COPY --from=builder /usr/local/bin/ /usr/local/bin/
628+
COPY --from=builder /usr/local/lib/ /usr/local/lib/
629+
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
630+
631+
632+
###
633+
### Post Install executions
634634
###
635635
###
636636
### Verify

‎Dockerfiles/mods/Dockerfile-5.3‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -692,18 +692,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.3-mods"
692692

693693

694694
###
695-
### Copy artifacts from builder
696-
###
697-
ARG EXT_DIR
698-
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
699-
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
700-
COPY --from=builder /usr/local/bin/ /usr/local/bin/
701-
COPY --from=builder /usr/local/lib/ /usr/local/lib/
702-
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
703-
704-
705-
###
706-
### Install
695+
### Install runtime libraries
707696
###
708697
RUN set -eux \
709698
&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -743,7 +732,18 @@ RUN set -eux \
743732

744733

745734
###
746-
### Post Install
735+
### Copy artifacts from builder
736+
###
737+
ARG EXT_DIR
738+
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
739+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
740+
COPY --from=builder /usr/local/bin/ /usr/local/bin/
741+
COPY --from=builder /usr/local/lib/ /usr/local/lib/
742+
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
743+
744+
745+
###
746+
### Post Install executions
747747
###
748748
RUN set -eux \
749749
# ---------- oci8 ----------

‎Dockerfiles/mods/Dockerfile-5.4‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -703,18 +703,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.4-mods"
703703

704704

705705
###
706-
### Copy artifacts from builder
707-
###
708-
ARG EXT_DIR
709-
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
710-
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
711-
COPY --from=builder /usr/local/bin/ /usr/local/bin/
712-
COPY --from=builder /usr/local/lib/ /usr/local/lib/
713-
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
714-
715-
716-
###
717-
### Install
706+
### Install runtime libraries
718707
###
719708
RUN set -eux \
720709
&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -754,7 +743,18 @@ RUN set -eux \
754743

755744

756745
###
757-
### Post Install
746+
### Copy artifacts from builder
747+
###
748+
ARG EXT_DIR
749+
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
750+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
751+
COPY --from=builder /usr/local/bin/ /usr/local/bin/
752+
COPY --from=builder /usr/local/lib/ /usr/local/lib/
753+
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
754+
755+
756+
###
757+
### Post Install executions
758758
###
759759
RUN set -eux \
760760
# ---------- oci8 ----------

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -741,18 +741,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.5-mods"
741741

742742

743743
###
744-
### Copy artifacts from builder
745-
###
746-
ARG EXT_DIR
747-
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
748-
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
749-
COPY --from=builder /usr/local/bin/ /usr/local/bin/
750-
COPY --from=builder /usr/local/lib/ /usr/local/lib/
751-
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
752-
753-
754-
###
755-
### Install
744+
### Install runtime libraries
756745
###
757746
RUN set -eux \
758747
&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -794,7 +783,18 @@ RUN set -eux \
794783

795784

796785
###
797-
### Post Install
786+
### Copy artifacts from builder
787+
###
788+
ARG EXT_DIR
789+
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
790+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
791+
COPY --from=builder /usr/local/bin/ /usr/local/bin/
792+
COPY --from=builder /usr/local/lib/ /usr/local/lib/
793+
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
794+
795+
796+
###
797+
### Post Install executions
798798
###
799799
RUN set -eux \
800800
# ---------- imagick ----------

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -760,18 +760,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.6-mods"
760760

761761

762762
###
763-
### Copy artifacts from builder
764-
###
765-
ARG EXT_DIR
766-
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
767-
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
768-
COPY --from=builder /usr/local/bin/ /usr/local/bin/
769-
COPY --from=builder /usr/local/lib/ /usr/local/lib/
770-
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
771-
772-
773-
###
774-
### Install
763+
### Install runtime libraries
775764
###
776765
RUN set -eux \
777766
&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -813,7 +802,18 @@ RUN set -eux \
813802

814803

815804
###
816-
### Post Install
805+
### Copy artifacts from builder
806+
###
807+
ARG EXT_DIR
808+
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
809+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
810+
COPY --from=builder /usr/local/bin/ /usr/local/bin/
811+
COPY --from=builder /usr/local/lib/ /usr/local/lib/
812+
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
813+
814+
815+
###
816+
### Post Install executions
817817
###
818818
RUN set -eux \
819819
# ---------- imagick ----------

‎Dockerfiles/mods/Dockerfile-7.0‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -846,18 +846,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.0-mods"
846846

847847

848848
###
849-
### Copy artifacts from builder
850-
###
851-
ARG EXT_DIR
852-
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
853-
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
854-
COPY --from=builder /usr/local/bin/ /usr/local/bin/
855-
COPY --from=builder /usr/local/lib/ /usr/local/lib/
856-
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
857-
858-
859-
###
860-
### Install
849+
### Install runtime libraries
861850
###
862851
RUN set -eux \
863852
&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -902,7 +891,18 @@ RUN set -eux \
902891

903892

904893
###
905-
### Post Install
894+
### Copy artifacts from builder
895+
###
896+
ARG EXT_DIR
897+
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
898+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
899+
COPY --from=builder /usr/local/bin/ /usr/local/bin/
900+
COPY --from=builder /usr/local/lib/ /usr/local/lib/
901+
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
902+
903+
904+
###
905+
### Post Install executions
906906
###
907907
RUN set -eux \
908908
# ---------- imagick ----------

‎Dockerfiles/mods/Dockerfile-7.1‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -854,18 +854,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.1-mods"
854854

855855

856856
###
857-
### Copy artifacts from builder
858-
###
859-
ARG EXT_DIR
860-
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
861-
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
862-
COPY --from=builder /usr/local/bin/ /usr/local/bin/
863-
COPY --from=builder /usr/local/lib/ /usr/local/lib/
864-
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
865-
866-
867-
###
868-
### Install
857+
### Install runtime libraries
869858
###
870859
RUN set -eux \
871860
&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -910,7 +899,18 @@ RUN set -eux \
910899

911900

912901
###
913-
### Post Install
902+
### Copy artifacts from builder
903+
###
904+
ARG EXT_DIR
905+
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
906+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
907+
COPY --from=builder /usr/local/bin/ /usr/local/bin/
908+
COPY --from=builder /usr/local/lib/ /usr/local/lib/
909+
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
910+
911+
912+
###
913+
### Post Install executions
914914
###
915915
RUN set -eux \
916916
# ---------- imagick ----------

‎Dockerfiles/mods/Dockerfile-7.2‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -857,18 +857,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.2-mods"
857857

858858

859859
###
860-
### Copy artifacts from builder
861-
###
862-
ARG EXT_DIR
863-
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
864-
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
865-
COPY --from=builder /usr/local/bin/ /usr/local/bin/
866-
COPY --from=builder /usr/local/lib/ /usr/local/lib/
867-
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
868-
869-
870-
###
871-
### Install
860+
### Install runtime libraries
872861
###
873862
RUN set -eux \
874863
&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -913,7 +902,18 @@ RUN set -eux \
913902

914903

915904
###
916-
### Post Install
905+
### Copy artifacts from builder
906+
###
907+
ARG EXT_DIR
908+
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
909+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
910+
COPY --from=builder /usr/local/bin/ /usr/local/bin/
911+
COPY --from=builder /usr/local/lib/ /usr/local/lib/
912+
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
913+
914+
915+
###
916+
### Post Install executions
917917
###
918918
RUN set -eux \
919919
# ---------- imagick ----------

‎Dockerfiles/mods/Dockerfile-7.3‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -847,18 +847,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.3-mods"
847847

848848

849849
###
850-
### Copy artifacts from builder
851-
###
852-
ARG EXT_DIR
853-
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
854-
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
855-
COPY --from=builder /usr/local/bin/ /usr/local/bin/
856-
COPY --from=builder /usr/local/lib/ /usr/local/lib/
857-
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
858-
859-
860-
###
861-
### Install
850+
### Install runtime libraries
862851
###
863852
RUN set -eux \
864853
&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -902,7 +891,18 @@ RUN set -eux \
902891

903892

904893
###
905-
### Post Install
894+
### Copy artifacts from builder
895+
###
896+
ARG EXT_DIR
897+
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
898+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
899+
COPY --from=builder /usr/local/bin/ /usr/local/bin/
900+
COPY --from=builder /usr/local/lib/ /usr/local/lib/
901+
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
902+
903+
904+
###
905+
### Post Install executions
906906
###
907907
RUN set -eux \
908908
# ---------- imagick ----------

‎Dockerfiles/mods/Dockerfile-7.4‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -833,18 +833,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.4-mods"
833833

834834

835835
###
836-
### Copy artifacts from builder
837-
###
838-
ARG EXT_DIR
839-
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
840-
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
841-
COPY --from=builder /usr/local/bin/ /usr/local/bin/
842-
COPY --from=builder /usr/local/lib/ /usr/local/lib/
843-
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
844-
845-
846-
###
847-
### Install
836+
### Install runtime libraries
848837
###
849838
RUN set -eux \
850839
&& DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -888,7 +877,18 @@ RUN set -eux \
888877

889878

890879
###
891-
### Post Install
880+
### Copy artifacts from builder
881+
###
882+
ARG EXT_DIR
883+
COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
884+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
885+
COPY --from=builder /usr/local/bin/ /usr/local/bin/
886+
COPY --from=builder /usr/local/lib/ /usr/local/lib/
887+
COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
888+
889+
890+
###
891+
### Post Install executions
892892
###
893893
RUN set -eux \
894894
# ---------- imagick ----------

0 commit comments

Comments
 (0)