From 40212aaa24b8cc9947aa8f20a20e90a59a012121 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Sat, 1 Jul 2017 14:31:06 +0200 Subject: [PATCH 1/2] Move apps.config.php into config dir --- {10.0/apache => .config}/apps.config.php | 0 10.0/apache/Dockerfile | 3 ++- 10.0/{fpm => apache/config}/apps.config.php | 0 10.0/fpm/Dockerfile | 3 ++- {11.0/apache => 10.0/fpm/config}/apps.config.php | 0 11.0/apache/Dockerfile | 3 ++- 11.0/{fpm => apache/config}/apps.config.php | 0 11.0/fpm/Dockerfile | 3 ++- {12.0/apache => 11.0/fpm/config}/apps.config.php | 0 12.0/apache/Dockerfile | 3 ++- 12.0/{fpm => apache/config}/apps.config.php | 0 12.0/fpm/Dockerfile | 3 ++- apps.config.php => 12.0/fpm/config/apps.config.php | 0 Dockerfile-php7.template | 3 ++- Dockerfile.template | 3 ++- update.sh | 4 ++-- 16 files changed, 18 insertions(+), 10 deletions(-) rename {10.0/apache => .config}/apps.config.php (100%) rename 10.0/{fpm => apache/config}/apps.config.php (100%) rename {11.0/apache => 10.0/fpm/config}/apps.config.php (100%) rename 11.0/{fpm => apache/config}/apps.config.php (100%) rename {12.0/apache => 11.0/fpm/config}/apps.config.php (100%) rename 12.0/{fpm => apache/config}/apps.config.php (100%) rename apps.config.php => 12.0/fpm/config/apps.config.php (100%) diff --git a/10.0/apache/apps.config.php b/.config/apps.config.php similarity index 100% rename from 10.0/apache/apps.config.php rename to .config/apps.config.php diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile index d8b15972..b482cb85 100644 --- a/10.0/apache/Dockerfile +++ b/10.0/apache/Dockerfile @@ -44,6 +44,8 @@ RUN a2enmod rewrite ENV NEXTCLOUD_VERSION 10.0.5 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 \ @@ -69,7 +71,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/10.0/fpm/apps.config.php b/10.0/apache/config/apps.config.php similarity index 100% rename from 10.0/fpm/apps.config.php rename to 10.0/apache/config/apps.config.php diff --git a/10.0/fpm/Dockerfile b/10.0/fpm/Dockerfile index b160a46c..a4faaef2 100644 --- a/10.0/fpm/Dockerfile +++ b/10.0/fpm/Dockerfile @@ -42,6 +42,8 @@ RUN set -ex \ ENV NEXTCLOUD_VERSION 10.0.5 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 \ @@ -67,7 +69,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/11.0/apache/apps.config.php b/10.0/fpm/config/apps.config.php similarity index 100% rename from 11.0/apache/apps.config.php rename to 10.0/fpm/config/apps.config.php diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile index d4c0ff52..9a6019b2 100644 --- a/11.0/apache/Dockerfile +++ b/11.0/apache/Dockerfile @@ -45,6 +45,8 @@ RUN a2enmod rewrite ENV NEXTCLOUD_VERSION 11.0.3 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/11.0/fpm/apps.config.php b/11.0/apache/config/apps.config.php similarity index 100% rename from 11.0/fpm/apps.config.php rename to 11.0/apache/config/apps.config.php diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile index 9aa10e0b..3fe1574b 100644 --- a/11.0/fpm/Dockerfile +++ b/11.0/fpm/Dockerfile @@ -43,6 +43,8 @@ RUN set -ex \ ENV NEXTCLOUD_VERSION 11.0.3 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/apache/apps.config.php b/11.0/fpm/config/apps.config.php similarity index 100% rename from 12.0/apache/apps.config.php rename to 11.0/fpm/config/apps.config.php 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/fpm/apps.config.php b/12.0/apache/config/apps.config.php similarity index 100% rename from 12.0/fpm/apps.config.php rename to 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/apps.config.php b/12.0/fpm/config/apps.config.php similarity index 100% rename from apps.config.php rename to 12.0/fpm/config/apps.config.php diff --git a/Dockerfile-php7.template b/Dockerfile-php7.template index ef49df7d..89e23b82 100644 --- a/Dockerfile-php7.template +++ b/Dockerfile-php7.template @@ -45,6 +45,8 @@ RUN a2enmod rewrite ENV NEXTCLOUD_VERSION %%VERSION%% 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 ["%%CMD%%"] diff --git a/Dockerfile.template b/Dockerfile.template index 581e9122..a25bdb66 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -44,6 +44,8 @@ RUN a2enmod rewrite ENV NEXTCLOUD_VERSION %%VERSION%% 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 \ @@ -69,7 +71,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 ["%%CMD%%"] diff --git a/update.sh b/update.sh index c8a94169..da0d6ade 100755 --- a/update.sh +++ b/update.sh @@ -56,8 +56,8 @@ for latest in "${latests[@]}"; do # Copy the docker-entrypoint. cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh" - # Copy apps.config.php - cp apps.config.php "$version/$variant/apps.config.php" + # Copy the config directory + cp -rT .config "$version/$variant/config" for arch in i386 amd64; do travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant"' ARCH='"$arch$travisEnv" From f4309b27dcce2def787aba243582a2a841b0f33e Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Sat, 1 Jul 2017 15:06:05 +0200 Subject: [PATCH 2/2] Add apcu.config.php --- .config/apcu.config.php | 4 ++++ 10.0/apache/config/apcu.config.php | 4 ++++ 10.0/fpm/config/apcu.config.php | 4 ++++ 11.0/apache/config/apcu.config.php | 4 ++++ 11.0/fpm/config/apcu.config.php | 4 ++++ 12.0/apache/config/apcu.config.php | 4 ++++ 12.0/fpm/config/apcu.config.php | 4 ++++ 7 files changed, 28 insertions(+) create mode 100644 .config/apcu.config.php create mode 100644 10.0/apache/config/apcu.config.php create mode 100644 10.0/fpm/config/apcu.config.php create mode 100644 11.0/apache/config/apcu.config.php create mode 100644 11.0/fpm/config/apcu.config.php create mode 100644 12.0/apache/config/apcu.config.php create mode 100644 12.0/fpm/config/apcu.config.php diff --git a/.config/apcu.config.php b/.config/apcu.config.php new file mode 100644 index 00000000..69fed876 --- /dev/null +++ b/.config/apcu.config.php @@ -0,0 +1,4 @@ + '\OC\Memcache\APCu', +); diff --git a/10.0/apache/config/apcu.config.php b/10.0/apache/config/apcu.config.php new file mode 100644 index 00000000..69fed876 --- /dev/null +++ b/10.0/apache/config/apcu.config.php @@ -0,0 +1,4 @@ + '\OC\Memcache\APCu', +); diff --git a/10.0/fpm/config/apcu.config.php b/10.0/fpm/config/apcu.config.php new file mode 100644 index 00000000..69fed876 --- /dev/null +++ b/10.0/fpm/config/apcu.config.php @@ -0,0 +1,4 @@ + '\OC\Memcache\APCu', +); diff --git a/11.0/apache/config/apcu.config.php b/11.0/apache/config/apcu.config.php new file mode 100644 index 00000000..69fed876 --- /dev/null +++ b/11.0/apache/config/apcu.config.php @@ -0,0 +1,4 @@ + '\OC\Memcache\APCu', +); diff --git a/11.0/fpm/config/apcu.config.php b/11.0/fpm/config/apcu.config.php new file mode 100644 index 00000000..69fed876 --- /dev/null +++ b/11.0/fpm/config/apcu.config.php @@ -0,0 +1,4 @@ + '\OC\Memcache\APCu', +); diff --git a/12.0/apache/config/apcu.config.php b/12.0/apache/config/apcu.config.php new file mode 100644 index 00000000..69fed876 --- /dev/null +++ b/12.0/apache/config/apcu.config.php @@ -0,0 +1,4 @@ + '\OC\Memcache\APCu', +); diff --git a/12.0/fpm/config/apcu.config.php b/12.0/fpm/config/apcu.config.php new file mode 100644 index 00000000..69fed876 --- /dev/null +++ b/12.0/fpm/config/apcu.config.php @@ -0,0 +1,4 @@ + '\OC\Memcache\APCu', +);