migration vers legacytools

support/Dockerfile.mariadb10

@@ -2,6 +2,7 @@
 ARG REGISTRY=pubdocker.univ-reunion.fr
 FROM $REGISTRY/src/base as base
 FROM $REGISTRY/src/mariadb as mariadb
+FROM $REGISTRY/src/legacytools as legacytools
 
 FROM mariadb:10
 ARG APT_PROXY TIMEZONE
@@ -11,5 +12,8 @@ COPY --from=base /g/ /g/
 COPY --from=mariadb /g/ /g/
 RUN /g/build -a @base @mariadb
 
+COPY --from=legacytools /g/ /g/
+RUN /g/build nutools servertools
+
 EXPOSE 3306
 ENTRYPOINT ["/g/entrypoint"]

support/Dockerfile.php-apache+ic

@@ -5,7 +5,7 @@ ARG REGISTRY=pubdocker.univ-reunion.fr
 FROM $REGISTRY/src/base as base
 FROM $REGISTRY/src/instantclient as instantclient
 FROM $REGISTRY/src/php as php
-FROM $REGISTRY/src/nutools as nutools
+FROM $REGISTRY/src/legacytools as legacytools
 
 ################################################################################
 FROM debian:${NDIST}-slim as builder
@@ -30,6 +30,9 @@ COPY --from=base /g/ /g/
 COPY --from=builder /src/su-exec/su-exec /g/
 RUN /g/build
 
+COPY --from=legacytools /g/ /g/
+RUN /g/build nutools
+
 COPY --from=php /g/ /g/
 RUN /g/build -a @apache-php-cas php-utils
 
@@ -37,8 +40,5 @@ COPY --from=instantclient /g/ /g/
 COPY --from=builder /opt/oracle/ /opt/oracle/
 RUN /g/build instantclient
 
-COPY --from=nutools /g/ /g/
-RUN /g/build nutools
-
 EXPOSE 80 443
 ENTRYPOINT ["/g/entrypoint"]

support/Dockerfile.php-cli+ic

@@ -5,7 +5,7 @@ ARG REGISTRY=pubdocker.univ-reunion.fr
 FROM $REGISTRY/src/base as base
 FROM $REGISTRY/src/instantclient as instantclient
 FROM $REGISTRY/src/php as php
-FROM $REGISTRY/src/nutools as nutools
+FROM $REGISTRY/src/legacytools as legacytools
 
 ################################################################################
 FROM debian:${NDIST}-slim as builder
@@ -30,6 +30,9 @@ COPY --from=base /g/ /g/
 COPY --from=builder /src/su-exec/su-exec /g/
 RUN /g/build
 
+COPY --from=legacytools /g/ /g/
+RUN /g/build nutools
+
 COPY --from=php /g/ /g/
 RUN /g/build @php-cli php-utils
 
@@ -37,7 +40,4 @@ COPY --from=instantclient /g/ /g/
 COPY --from=builder /opt/oracle/ /opt/oracle/
 RUN /g/build instantclient
 
-COPY --from=nutools /g/ /g/
-RUN /g/build nutools
-
 ENTRYPOINT ["/g/entrypoint"]

support/Dockerfile.rundk+ic

@@ -5,7 +5,7 @@ ARG REGISTRY=pubdocker.univ-reunion.fr
 FROM $REGISTRY/src/base as base
 FROM $REGISTRY/src/instantclient as instantclient
 FROM $REGISTRY/src/php as php
-FROM $REGISTRY/src/nutools as nutools
+FROM $REGISTRY/src/legacytools as legacytools
 
 ################################################################################
 FROM debian:${NDIST}-slim as builder
@@ -30,6 +30,9 @@ COPY --from=base /g/ /g/
 COPY --from=builder /src/su-exec/su-exec /g/
 RUN /g/build
 
+COPY --from=legacytools /g/ /g/
+RUN /g/build nutools
+
 COPY --from=php /g/ /g/
 RUN /g/build @php-cli php-utils
 
@@ -37,7 +40,4 @@ COPY --from=instantclient /g/ /g/
 COPY --from=builder /opt/oracle/ /opt/oracle/
 RUN /g/build instantclient
 
-COPY --from=nutools /g/ /g/
-RUN /g/build nutools
-
 ENTRYPOINT ["/g/entrypoint"]