aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

Merge branch 'overwritewebroot'

Browse source
This commit is contained in:
naramski 2018-12-14 10:41:27 +01:00
commit 3c4399853d
70 changed files with 144 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.examples/README.md
View file

@ -32,11 +32,6 @@ The required steps for each optional/recommended package that is not already in
#### PHP Module bz2 #### PHP Module bz2
`docker-php-ext-install bz2` `docker-php-ext-install bz2`
#### PHP Module imagick
`apt install libmagickwand-dev`
`pecl install imagick`
`docker-php-ext-enable imagick`
#### PHP Module imap #### PHP Module imap
`apt install libc-client-dev libkrb5-dev` `apt install libc-client-dev libkrb5-dev`
`docker-php-ext-configure imap --with-kerberos --with-imap-ssl` `docker-php-ext-configure imap --with-kerberos --with-imap-ssl`

2
.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
View file

@ -13,7 +13,7 @@ services:
- db.env - db.env
redis: redis:
image: redis image: redis:alpine
restart: always restart: always
app: app:

2
.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nextcloud:fpm FROM nextcloud:fpm-alpine
COPY redis.config.php /usr/src/nextcloud/config/redis.config.php COPY redis.config.php /usr/src/nextcloud/config/redis.config.php

2
.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
View file

@ -13,7 +13,7 @@ services:
- db.env - db.env
redis: redis:
image: redis image: redis:alpine
restart: always restart: always
app: app:

2
.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

1
.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
View file

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

2
.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
View file

@ -13,7 +13,7 @@ services:
- db.env - db.env
app: app:
image: nextcloud:fpm image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html

2
.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

1
.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
View file

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

2
.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
View file

@ -2,7 +2,7 @@ version: '3'
services: services:
db: db:
image: postgres image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data

4
.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
View file

@ -2,7 +2,7 @@ version: '3'
services: services:
db: db:
image: postgres image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data
@ -10,7 +10,7 @@ services:
- db.env - db.env
app: app:
image: nextcloud:fpm image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html

2
.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

1
.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
View file

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

2
.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
View file

@ -13,7 +13,7 @@ services:
- db.env - db.env
app: app:
image: nextcloud:fpm image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html

2
.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

1
.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf
View file

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

2
.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
View file

@ -13,7 +13,7 @@ services:
- db.env - db.env
redis: redis:
image: redis image: redis:alpine
restart: always restart: always
app: app:

2
.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nextcloud:fpm FROM nextcloud:fpm-alpine
COPY redis.config.php /usr/src/nextcloud/config/redis.config.php COPY redis.config.php /usr/src/nextcloud/config/redis.config.php

2
.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
View file

@ -13,7 +13,7 @@ services:
- db.env - db.env
redis: redis:
image: redis image: redis:alpine
restart: always restart: always
app: app:

2
.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

1
.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf
View file

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

2
.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
View file

@ -13,7 +13,7 @@ services:
- db.env - db.env
app: app:
image: nextcloud:fpm image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html

2
.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

1
.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
View file

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

2
.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
View file

@ -2,7 +2,7 @@ version: '3'
services: services:
db: db:
image: postgres image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data

4
.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
View file

@ -2,7 +2,7 @@ version: '3'
services: services:
db: db:
image: postgres image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data
@ -10,7 +10,7 @@ services:
- db.env - db.env
app: app:
image: nextcloud:fpm image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html

2
.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

1
.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
View file

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

6
.examples/dockerfiles/full/apache/Dockerfile
View file

@ -4,7 +4,7 @@ RUN mkdir -p /usr/share/man/man1 \
&& apt-get update && apt-get install -y \ && apt-get update && apt-get install -y \
supervisor \ supervisor \
ffmpeg \ ffmpeg \
libmagickwand-dev \ libbz2-dev \
libgmp3-dev \ libgmp3-dev \
libc-client-dev \ libc-client-dev \
libkrb5-dev \ libkrb5-dev \
@ -15,8 +15,8 @@ RUN mkdir -p /usr/share/man/man1 \
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \ && ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \
&& docker-php-ext-install bz2 gmp imap \ && docker-php-ext-install bz2 gmp imap \
&& pecl install imagick smbclient \ && pecl install smbclient \
&& docker-php-ext-enable imagick smbclient \ && docker-php-ext-enable smbclient \
&& mkdir /var/log/supervisord /var/run/supervisord && mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /etc/supervisor/supervisord.conf

6
.examples/dockerfiles/full/fpm/Dockerfile
View file

@ -4,7 +4,7 @@ RUN mkdir -p /usr/share/man/man1 \
&& apt-get update && apt-get install -y \ && apt-get update && apt-get install -y \
supervisor \ supervisor \
ffmpeg \ ffmpeg \
libmagickwand-dev \ libbz2-dev \
libgmp3-dev \ libgmp3-dev \
libc-client-dev \ libc-client-dev \
libkrb5-dev \ libkrb5-dev \
@ -15,8 +15,8 @@ RUN mkdir -p /usr/share/man/man1 \
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \ && ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \
&& docker-php-ext-install bz2 gmp imap \ && docker-php-ext-install bz2 gmp imap \
&& pecl install imagick smbclient \ && pecl install smbclient \
&& docker-php-ext-enable imagick smbclient \ && docker-php-ext-enable smbclient \
&& mkdir /var/log/supervisord /var/run/supervisord && mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /etc/supervisor/supervisord.conf

14
.travis.yml
View file

@ -50,13 +50,7 @@ jobs:
- ./generate-stackbrew-library.sh - ./generate-stackbrew-library.sh
- stage: test images - stage: test images
env: VERSION=12.0 VARIANT=fpm-alpine ARCH=amd64 env: VERSION=13.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=12.0 VARIANT=fpm-alpine ARCH=i386
- env: VERSION=12.0 VARIANT=fpm ARCH=amd64
- env: VERSION=12.0 VARIANT=fpm ARCH=i386
- env: VERSION=12.0 VARIANT=apache ARCH=amd64
- env: VERSION=12.0 VARIANT=apache ARCH=i386
- env: VERSION=13.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=13.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=13.0 VARIANT=fpm-alpine ARCH=i386
- env: VERSION=13.0 VARIANT=fpm ARCH=amd64 - env: VERSION=13.0 VARIANT=fpm ARCH=amd64
- env: VERSION=13.0 VARIANT=fpm ARCH=i386 - env: VERSION=13.0 VARIANT=fpm ARCH=i386
@ -68,3 +62,9 @@ jobs:
- env: VERSION=14.0 VARIANT=fpm ARCH=i386 - env: VERSION=14.0 VARIANT=fpm ARCH=i386
- env: VERSION=14.0 VARIANT=apache ARCH=amd64 - env: VERSION=14.0 VARIANT=apache ARCH=amd64
- env: VERSION=14.0 VARIANT=apache ARCH=i386 - env: VERSION=14.0 VARIANT=apache ARCH=i386
- env: VERSION=15.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=15.0 VARIANT=fpm-alpine ARCH=i386
- env: VERSION=15.0 VARIANT=fpm ARCH=amd64
- env: VERSION=15.0 VARIANT=fpm ARCH=i386
- env: VERSION=15.0 VARIANT=apache ARCH=amd64
- env: VERSION=15.0 VARIANT=apache ARCH=i386

11
13.0/apache/Dockerfile
View file

@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -51,14 +52,16 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.12; \ pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@ -106,7 +109,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip
ENV NEXTCLOUD_VERSION 13.0.7 ENV NEXTCLOUD_VERSION 13.0.8
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -122,7 +125,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

2
13.0/apache/entrypoint.sh
View file

@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nexcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]

11
13.0/fpm-alpine/Dockerfile
View file

@ -28,6 +28,7 @@ RUN set -ex; \
openldap-dev \ openldap-dev \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@ -45,14 +46,16 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.12; \ pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
runDeps="$( \ runDeps="$( \
@ -87,7 +90,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 13.0.7 ENV NEXTCLOUD_VERSION 13.0.8
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \
@ -101,7 +104,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

2
13.0/fpm-alpine/entrypoint.sh
View file

@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nexcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]

11
13.0/fpm/Dockerfile
View file

@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -51,14 +52,16 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.12; \ pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@ -98,7 +101,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 13.0.7 ENV NEXTCLOUD_VERSION 13.0.8
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -114,7 +117,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

2
13.0/fpm/entrypoint.sh
View file

@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nexcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]

11
14.0/apache/Dockerfile
View file

@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -51,14 +52,16 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.12; \ pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@ -106,7 +109,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip
ENV NEXTCLOUD_VERSION 14.0.3 ENV NEXTCLOUD_VERSION 14.0.4
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -122,7 +125,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

2
14.0/apache/entrypoint.sh
View file

@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nexcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]

11
14.0/fpm-alpine/Dockerfile
View file

@ -28,6 +28,7 @@ RUN set -ex; \
openldap-dev \ openldap-dev \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@ -45,14 +46,16 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.12; \ pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
runDeps="$( \ runDeps="$( \
@ -87,7 +90,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 14.0.3 ENV NEXTCLOUD_VERSION 14.0.4
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \
@ -101,7 +104,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

2
14.0/fpm-alpine/entrypoint.sh
View file

@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nexcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]

11
14.0/fpm/Dockerfile
View file

@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -51,14 +52,16 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.12; \ pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@ -98,7 +101,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 14.0.3 ENV NEXTCLOUD_VERSION 14.0.4
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -114,7 +117,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

2
14.0/fpm/entrypoint.sh
View file

@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nexcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]

17
12.0/apache/Dockerfile → 15.0/apache/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.1-apache-stretch FROM php:7.2-apache-stretch
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -51,14 +52,16 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.12; \ pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@ -106,7 +109,11 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip
ENV NEXTCLOUD_VERSION 12.0.12 <<<<<<< HEAD:15.0/apache/Dockerfile
ENV NEXTCLOUD_VERSION 15.0.0
=======
ENV NEXTCLOUD_VERSION 12.0.13
>>>>>>> Add two parameters when Nextcloud is behind a proxy:12.0/apache/Dockerfile
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -122,7 +129,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

0
12.0/apache/config/apache-pretty-urls.config.php → 15.0/apache/config/apache-pretty-urls.config.php
View file

0
12.0/apache/config/apcu.config.php → 15.0/apache/config/apcu.config.php
View file

0
12.0/apache/config/apps.config.php → 15.0/apache/config/apps.config.php
View file

0
12.0/apache/config/autoconfig.php → 15.0/apache/config/autoconfig.php
View file

0
12.0/apache/cron.sh → 15.0/apache/cron.sh
View file

2
12.0/fpm/entrypoint.sh → 15.0/apache/entrypoint.sh
View file

@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nexcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]

0
12.0/apache/upgrade.exclude → 15.0/apache/upgrade.exclude
View file

17
12.0/fpm-alpine/Dockerfile → 15.0/fpm-alpine/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.1-fpm-alpine3.8 FROM php:7.2-fpm-alpine3.8
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -28,6 +28,7 @@ RUN set -ex; \
openldap-dev \ openldap-dev \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@ -45,14 +46,16 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.12; \ pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
runDeps="$( \ runDeps="$( \
@ -87,7 +90,11 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 12.0.12 <<<<<<< HEAD:15.0/fpm-alpine/Dockerfile
ENV NEXTCLOUD_VERSION 15.0.0
=======
ENV NEXTCLOUD_VERSION 12.0.13
>>>>>>> Add two parameters when Nextcloud is behind a proxy:12.0/fpm-alpine/Dockerfile
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \
@ -101,7 +108,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

0
12.0/fpm-alpine/config/apcu.config.php → 15.0/fpm-alpine/config/apcu.config.php
View file

0
12.0/fpm-alpine/config/apps.config.php → 15.0/fpm-alpine/config/apps.config.php
View file

0
12.0/fpm-alpine/config/autoconfig.php → 15.0/fpm-alpine/config/autoconfig.php
View file

0
12.0/fpm-alpine/cron.sh → 15.0/fpm-alpine/cron.sh
View file

2
12.0/apache/entrypoint.sh → 15.0/fpm-alpine/entrypoint.sh
View file

@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nexcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]

0
12.0/fpm-alpine/upgrade.exclude → 15.0/fpm-alpine/upgrade.exclude
View file

17
12.0/fpm/Dockerfile → 15.0/fpm/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.1-fpm-stretch FROM php:7.2-fpm-stretch
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -51,14 +52,16 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.12; \ pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@ -98,7 +101,11 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 12.0.12 <<<<<<< HEAD:15.0/fpm/Dockerfile
ENV NEXTCLOUD_VERSION 15.0.0
=======
ENV NEXTCLOUD_VERSION 12.0.13
>>>>>>> Add two parameters when Nextcloud is behind a proxy:12.0/fpm/Dockerfile
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -114,7 +121,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

0
12.0/fpm/config/apcu.config.php → 15.0/fpm/config/apcu.config.php
View file

0
12.0/fpm/config/apps.config.php → 15.0/fpm/config/apps.config.php
View file

0
12.0/fpm/config/autoconfig.php → 15.0/fpm/config/autoconfig.php
View file

0
12.0/fpm/cron.sh → 15.0/fpm/cron.sh
View file

2
12.0/fpm-alpine/entrypoint.sh → 15.0/fpm/entrypoint.sh
View file

@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nexcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]

0
12.0/fpm/upgrade.exclude → 15.0/fpm/upgrade.exclude
View file

5
Dockerfile-alpine.template
View file

@ -27,6 +27,7 @@ RUN set -ex; \
openldap-dev \ openldap-dev \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@ -47,11 +48,13 @@ RUN set -ex; \
pecl install APCu-%%APCU_VERSION%%; \ pecl install APCu-%%APCU_VERSION%%; \
pecl install memcached-%%MEMCACHED_VERSION%%; \ pecl install memcached-%%MEMCACHED_VERSION%%; \
pecl install redis-%%REDIS_VERSION%%; \ pecl install redis-%%REDIS_VERSION%%; \
pecl install imagick-%%IMAGICK_VERSION%%; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
runDeps="$( \ runDeps="$( \
@ -100,7 +103,7 @@ RUN set -ex; \
"%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

5
Dockerfile-debian.template
View file

@ -32,6 +32,7 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -53,11 +54,13 @@ RUN set -ex; \
pecl install APCu-%%APCU_VERSION%%; \ pecl install APCu-%%APCU_VERSION%%; \
pecl install memcached-%%MEMCACHED_VERSION%%; \ pecl install memcached-%%MEMCACHED_VERSION%%; \
pecl install redis-%%REDIS_VERSION%%; \ pecl install redis-%%REDIS_VERSION%%; \
pecl install imagick-%%IMAGICK_VERSION%%; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@ -113,7 +116,7 @@ RUN set -ex; \
"%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
gpgconf --kill all; \ gpgconf --kill all; \

2
docker-entrypoint.sh
View file

@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nexcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]

4
generate-stackbrew-library.sh
View file

@ -2,8 +2,8 @@
set -Eeuo pipefail set -Eeuo pipefail
declare -A release_channel=( declare -A release_channel=(
[production]='13.0.7' [production]='13.0.8'
[stable]='13.0.7' [stable]='14.0.4'
) )
self="$(basename "$BASH_SOURCE")" self="$(basename "$BASH_SOURCE")"

19
update.sh
View file

@ -25,9 +25,10 @@ declare -A extras=(
) )
declare -A pecl_versions=( declare -A pecl_versions=(
[APCu]='5.1.12' [APCu]='5.1.15'
[memcached]='3.0.4' [memcached]='3.0.4'
[redis]='4.1.1' [redis]='4.2.0'
[imagick]='3.4.3'
) )
variants=( variants=(
@ -36,7 +37,7 @@ variants=(
fpm-alpine fpm-alpine
) )
min_version='12.0' min_version='13.0'
# version_greater_or_equal A B returns whether A >= B # version_greater_or_equal A B returns whether A >= B
function version_greater_or_equal() { function version_greater_or_equal() {
@ -78,6 +79,7 @@ function create_variant() {
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g; s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g; s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g; s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
' "$dir/Dockerfile" ' "$dir/Dockerfile"
# Copy the shell scripts # Copy the shell scripts
@ -97,7 +99,7 @@ function create_variant() {
fi fi
for arch in i386 amd64; do for arch in i386 amd64; do
travisEnv='\n - env: VERSION='"$1"' VARIANT='"$variant"' ARCH='"$arch$travisEnv" travisEnv=' - env: VERSION='"$1"' VARIANT='"$variant"' ARCH='"$arch"'\n'"$travisEnv"
done done
} }
@ -160,9 +162,10 @@ for version in "${versions_beta[@]}"; do
fi fi
done done
# remove everything after '- stage: test images'
travis="$(awk '!p; /- stage: test images/ {p=1}' .travis.yml)"
echo "$travis" > .travis.yml
# replace the fist '-' with ' ' # replace the fist '-' with ' '
travisEnv="$(echo "$travisEnv" | sed '0,/-/{s/-/ /}')" travisEnv="$(echo "$travisEnv" | sed '0,/-/{s/-/ /}')"
printf "$travisEnv" >> .travis.yml
# update .travis.yml
travis="$(awk -v 'RS=\n\n' '$1 == "-" && $2 == "stage:" && $3 == "test" && $4 == "images" { $0 = " - stage: test images'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
echo "$travis" > .travis.yml