diff options
| author | Tilo Spannagel <development@tilosp.de> | 2017-07-01 14:31:06 +0200 |
|---|---|---|
| committer | Tilo Spannagel <development@tilosp.de> | 2017-07-01 14:39:23 +0200 |
| commit | 40212aaa24b8cc9947aa8f20a20e90a59a012121 (patch) | |
| tree | 03de0d4e23a2b72c19aa7e1b8249515871479e76 /12.0 | |
| parent | ec85bdaf208fe3c6007cc098b93cfff3c30efa39 (diff) | |
Move apps.config.php into config dir
Diffstat (limited to '12.0')
| -rw-r--r-- | 12.0/apache/Dockerfile | 3 | ||||
| -rw-r--r-- | 12.0/apache/config/apps.config.php (renamed from 12.0/apache/apps.config.php) | 0 | ||||
| -rw-r--r-- | 12.0/fpm/Dockerfile | 3 | ||||
| -rw-r--r-- | 12.0/fpm/config/apps.config.php (renamed from 12.0/fpm/apps.config.php) | 0 |
4 files changed, 4 insertions, 2 deletions
diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index 1b05272b..1377017c 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -45,6 +45,8 @@ RUN a2enmod rewrite ENV NEXTCLOUD_VERSION 12.0.0 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 \ @@ -70,7 +72,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh -COPY apps.config.php /usr/src/nextcloud/config/apps.config.php ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/12.0/apache/apps.config.php b/12.0/apache/config/apps.config.php index a4bed833..a4bed833 100644 --- a/12.0/apache/apps.config.php +++ b/12.0/apache/config/apps.config.php diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index 41b7365f..bcf3a3e4 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -43,6 +43,8 @@ RUN set -ex \ ENV NEXTCLOUD_VERSION 12.0.0 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 \ @@ -68,7 +70,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \ && chmod +x /usr/src/nextcloud/occ COPY docker-entrypoint.sh /entrypoint.sh -COPY apps.config.php /usr/src/nextcloud/config/apps.config.php ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/12.0/fpm/apps.config.php b/12.0/fpm/config/apps.config.php index a4bed833..a4bed833 100644 --- a/12.0/fpm/apps.config.php +++ b/12.0/fpm/config/apps.config.php |