adphi/Nextcloud-Docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move apps.config.php into config dir

Browse Source
This commit is contained in:
Tilo Spannagel 2017-07-01 14:31:06 +02:00
parent ec85bdaf20
commit 40212aaa24
No known key found for this signature in database
GPG Key ID: B89F1626A58E1429
16 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
10.0/apache/apps.config.php → .config/apps.config.php
View File

3
10.0/apache/Dockerfile
View File

@ -44,6 +44,8 @@ RUN a2enmod rewrite
ENV NEXTCLOUD_VERSION 10.0.5 ENV NEXTCLOUD_VERSION 10.0.5
VOLUME /var/www/html VOLUME /var/www/html
COPY config/* /usr/src/nextcloud/config/
RUN curl -fsSL -o nextcloud.tar.bz2 \ RUN curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
&& curl -fsSL -o nextcloud.tar.bz2.asc \ && curl -fsSL -o nextcloud.tar.bz2.asc \
@ -69,7 +71,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& chmod +x /usr/src/nextcloud/occ && chmod +x /usr/src/nextcloud/occ
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

0
10.0/fpm/apps.config.php → 10.0/apache/config/apps.config.php
View File

3
10.0/fpm/Dockerfile
View File

@ -42,6 +42,8 @@ RUN set -ex \
ENV NEXTCLOUD_VERSION 10.0.5 ENV NEXTCLOUD_VERSION 10.0.5
VOLUME /var/www/html VOLUME /var/www/html
COPY config/* /usr/src/nextcloud/config/
RUN curl -fsSL -o nextcloud.tar.bz2 \ RUN curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
&& curl -fsSL -o nextcloud.tar.bz2.asc \ && curl -fsSL -o nextcloud.tar.bz2.asc \
@ -67,7 +69,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& chmod +x /usr/src/nextcloud/occ && chmod +x /usr/src/nextcloud/occ
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

0
11.0/apache/apps.config.php → 10.0/fpm/config/apps.config.php
View File

3
11.0/apache/Dockerfile
View File

@ -45,6 +45,8 @@ RUN a2enmod rewrite
ENV NEXTCLOUD_VERSION 11.0.3 ENV NEXTCLOUD_VERSION 11.0.3
VOLUME /var/www/html VOLUME /var/www/html
COPY config/* /usr/src/nextcloud/config/
RUN curl -fsSL -o nextcloud.tar.bz2 \ RUN curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
&& curl -fsSL -o nextcloud.tar.bz2.asc \ && curl -fsSL -o nextcloud.tar.bz2.asc \
@ -70,7 +72,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& chmod +x /usr/src/nextcloud/occ && chmod +x /usr/src/nextcloud/occ
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

0
11.0/fpm/apps.config.php → 11.0/apache/config/apps.config.php
View File

3
11.0/fpm/Dockerfile
View File

@ -43,6 +43,8 @@ RUN set -ex \
ENV NEXTCLOUD_VERSION 11.0.3 ENV NEXTCLOUD_VERSION 11.0.3
VOLUME /var/www/html VOLUME /var/www/html
COPY config/* /usr/src/nextcloud/config/
RUN curl -fsSL -o nextcloud.tar.bz2 \ RUN curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
&& curl -fsSL -o nextcloud.tar.bz2.asc \ && curl -fsSL -o nextcloud.tar.bz2.asc \
@ -68,7 +70,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& chmod +x /usr/src/nextcloud/occ && chmod +x /usr/src/nextcloud/occ
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

0
12.0/apache/apps.config.php → 11.0/fpm/config/apps.config.php
View File

3
12.0/apache/Dockerfile
View File

@ -45,6 +45,8 @@ RUN a2enmod rewrite
ENV NEXTCLOUD_VERSION 12.0.0 ENV NEXTCLOUD_VERSION 12.0.0
VOLUME /var/www/html VOLUME /var/www/html
COPY config/* /usr/src/nextcloud/config/
RUN curl -fsSL -o nextcloud.tar.bz2 \ RUN curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
&& curl -fsSL -o nextcloud.tar.bz2.asc \ && curl -fsSL -o nextcloud.tar.bz2.asc \
@ -70,7 +72,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& chmod +x /usr/src/nextcloud/occ && chmod +x /usr/src/nextcloud/occ
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

0
12.0/fpm/apps.config.php → 12.0/apache/config/apps.config.php
View File

3
12.0/fpm/Dockerfile
View File

@ -43,6 +43,8 @@ RUN set -ex \
ENV NEXTCLOUD_VERSION 12.0.0 ENV NEXTCLOUD_VERSION 12.0.0
VOLUME /var/www/html VOLUME /var/www/html
COPY config/* /usr/src/nextcloud/config/
RUN curl -fsSL -o nextcloud.tar.bz2 \ RUN curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
&& curl -fsSL -o nextcloud.tar.bz2.asc \ && curl -fsSL -o nextcloud.tar.bz2.asc \
@ -68,7 +70,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& chmod +x /usr/src/nextcloud/occ && chmod +x /usr/src/nextcloud/occ
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

0
apps.config.php → 12.0/fpm/config/apps.config.php
View File

3
Dockerfile-php7.template
View File

@ -45,6 +45,8 @@ RUN a2enmod rewrite
ENV NEXTCLOUD_VERSION %%VERSION%% ENV NEXTCLOUD_VERSION %%VERSION%%
VOLUME /var/www/html VOLUME /var/www/html
COPY config/* /usr/src/nextcloud/config/
RUN curl -fsSL -o nextcloud.tar.bz2 \ RUN curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
&& curl -fsSL -o nextcloud.tar.bz2.asc \ && curl -fsSL -o nextcloud.tar.bz2.asc \
@ -70,7 +72,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& chmod +x /usr/src/nextcloud/occ && chmod +x /usr/src/nextcloud/occ
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

3
Dockerfile.template
View File

@ -44,6 +44,8 @@ RUN a2enmod rewrite
ENV NEXTCLOUD_VERSION %%VERSION%% ENV NEXTCLOUD_VERSION %%VERSION%%
VOLUME /var/www/html VOLUME /var/www/html
COPY config/* /usr/src/nextcloud/config/
RUN curl -fsSL -o nextcloud.tar.bz2 \ RUN curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
&& curl -fsSL -o nextcloud.tar.bz2.asc \ && curl -fsSL -o nextcloud.tar.bz2.asc \
@ -69,7 +71,6 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& chmod +x /usr/src/nextcloud/occ && chmod +x /usr/src/nextcloud/occ
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

4
update.sh
View File

@ -56,8 +56,8 @@ for latest in "${latests[@]}"; do
# Copy the docker-entrypoint. # Copy the docker-entrypoint.
cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh" cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh"
# Copy apps.config.php # Copy the config directory
cp apps.config.php "$version/$variant/apps.config.php" cp -rT .config "$version/$variant/config"
for arch in i386 amd64; do for arch in i386 amd64; do
travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant"' ARCH='"$arch$travisEnv" travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"