From 7366057ce105d50df72df819193182cabfafa4e1 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Mon, 7 Aug 2017 16:02:46 +0200 Subject: [PATCH] Move COPY back down --- 10.0/apache/Dockerfile | 3 +-- 10.0/fpm/Dockerfile | 3 +-- 11.0/apache/Dockerfile | 3 +-- 11.0/fpm/Dockerfile | 3 +-- 12.0/apache/Dockerfile | 3 +-- 12.0/fpm/Dockerfile | 3 +-- Dockerfile-php7.template | 3 +-- Dockerfile.template | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile index 434fe7fb..f1342612 100644 --- a/10.0/apache/Dockerfile +++ b/10.0/apache/Dockerfile @@ -46,8 +46,6 @@ ENV NEXTCLOUD_VERSION 10.0.6 RUN chown -R www-data:root /var/www/html VOLUME /var/www/html -COPY config/* /usr/src/nextcloud/config/ - RUN curl -fsSL -o nextcloud.tar.bz2 \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ && curl -fsSL -o nextcloud.tar.bz2.asc \ @@ -65,6 +63,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh +COPY config/* /usr/src/nextcloud/config/ ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/10.0/fpm/Dockerfile b/10.0/fpm/Dockerfile index 904713cb..57aa3982 100644 --- a/10.0/fpm/Dockerfile +++ b/10.0/fpm/Dockerfile @@ -44,8 +44,6 @@ ENV NEXTCLOUD_VERSION 10.0.6 RUN chown -R www-data:root /var/www/html VOLUME /var/www/html -COPY config/* /usr/src/nextcloud/config/ - RUN curl -fsSL -o nextcloud.tar.bz2 \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ && curl -fsSL -o nextcloud.tar.bz2.asc \ @@ -63,6 +61,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh +COPY config/* /usr/src/nextcloud/config/ ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile index 1644c16a..0182e0a9 100644 --- a/11.0/apache/Dockerfile +++ b/11.0/apache/Dockerfile @@ -47,8 +47,6 @@ ENV NEXTCLOUD_VERSION 11.0.4 RUN chown -R www-data:root /var/www/html VOLUME /var/www/html -COPY config/* /usr/src/nextcloud/config/ - RUN curl -fsSL -o nextcloud.tar.bz2 \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ && curl -fsSL -o nextcloud.tar.bz2.asc \ @@ -66,6 +64,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh +COPY config/* /usr/src/nextcloud/config/ ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile index 3a9b4ff2..6fbe9a10 100644 --- a/11.0/fpm/Dockerfile +++ b/11.0/fpm/Dockerfile @@ -45,8 +45,6 @@ ENV NEXTCLOUD_VERSION 11.0.4 RUN chown -R www-data:root /var/www/html VOLUME /var/www/html -COPY config/* /usr/src/nextcloud/config/ - RUN curl -fsSL -o nextcloud.tar.bz2 \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ && curl -fsSL -o nextcloud.tar.bz2.asc \ @@ -64,6 +62,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh +COPY config/* /usr/src/nextcloud/config/ ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index 10fdbb0a..2e4949cb 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -47,8 +47,6 @@ ENV NEXTCLOUD_VERSION 12.0.2 RUN chown -R www-data:root /var/www/html VOLUME /var/www/html -COPY config/* /usr/src/nextcloud/config/ - RUN curl -fsSL -o nextcloud.tar.bz2 \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ && curl -fsSL -o nextcloud.tar.bz2.asc \ @@ -66,6 +64,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh +COPY config/* /usr/src/nextcloud/config/ ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index 09eb43de..399ff1ff 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -45,8 +45,6 @@ ENV NEXTCLOUD_VERSION 12.0.2 RUN chown -R www-data:root /var/www/html VOLUME /var/www/html -COPY config/* /usr/src/nextcloud/config/ - RUN curl -fsSL -o nextcloud.tar.bz2 \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ && curl -fsSL -o nextcloud.tar.bz2.asc \ @@ -64,6 +62,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh +COPY config/* /usr/src/nextcloud/config/ ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/Dockerfile-php7.template b/Dockerfile-php7.template index 54dd45b4..54a9a3b6 100644 --- a/Dockerfile-php7.template +++ b/Dockerfile-php7.template @@ -47,8 +47,6 @@ ENV NEXTCLOUD_VERSION %%VERSION%% RUN chown -R www-data:root /var/www/html VOLUME /var/www/html -COPY config/* /usr/src/nextcloud/config/ - RUN curl -fsSL -o nextcloud.tar.bz2 \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ && curl -fsSL -o nextcloud.tar.bz2.asc \ @@ -66,6 +64,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh +COPY config/* /usr/src/nextcloud/config/ ENTRYPOINT ["/entrypoint.sh"] CMD ["%%CMD%%"] diff --git a/Dockerfile.template b/Dockerfile.template index 6dfab790..88873192 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -46,8 +46,6 @@ ENV NEXTCLOUD_VERSION %%VERSION%% RUN chown -R www-data:root /var/www/html VOLUME /var/www/html -COPY config/* /usr/src/nextcloud/config/ - RUN curl -fsSL -o nextcloud.tar.bz2 \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ && curl -fsSL -o nextcloud.tar.bz2.asc \ @@ -65,6 +63,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh +COPY config/* /usr/src/nextcloud/config/ ENTRYPOINT ["/entrypoint.sh"] CMD ["%%CMD%%"]