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 pull request #3 from nextcloud/master

Browse source 
Merge master back
This commit is contained in:
kgw4it 2018-11-26 14:52:14 +01:00 • committed by GitHub
commit 1c5bc71b61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 88 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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;

12
.travis.yml
View file

@ -50,12 +50,12 @@ jobs:
- ./generate-stackbrew-library.sh - ./generate-stackbrew-library.sh
- stage: test images - stage: test images
env: VERSION=15.0-beta VARIANT=fpm-alpine ARCH=amd64 env: VERSION=15.0-rc VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=15.0-beta VARIANT=fpm-alpine ARCH=i386 - env: VERSION=15.0-rc VARIANT=fpm-alpine ARCH=i386
- env: VERSION=15.0-beta VARIANT=fpm ARCH=amd64 - env: VERSION=15.0-rc VARIANT=fpm ARCH=amd64
- env: VERSION=15.0-beta VARIANT=fpm ARCH=i386 - env: VERSION=15.0-rc VARIANT=fpm ARCH=i386
- env: VERSION=15.0-beta VARIANT=apache ARCH=amd64 - env: VERSION=15.0-rc VARIANT=apache ARCH=amd64
- env: VERSION=15.0-beta VARIANT=apache ARCH=i386 - env: VERSION=15.0-rc VARIANT=apache ARCH=i386
- env: VERSION=12.0 VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=12.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=i386
- env: VERSION=12.0 VARIANT=fpm ARCH=amd64 - env: VERSION=12.0 VARIANT=fpm ARCH=amd64

8
12.0/apache/Dockerfile
View file

@ -51,9 +51,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -106,7 +106,7 @@ 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 ENV NEXTCLOUD_VERSION 12.0.13
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -122,7 +122,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; \

8
12.0/fpm-alpine/Dockerfile
View file

@ -45,9 +45,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -87,7 +87,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 12.0.12 ENV NEXTCLOUD_VERSION 12.0.13
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \
@ -101,7 +101,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; \

8
12.0/fpm/Dockerfile
View file

@ -51,9 +51,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -98,7 +98,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 12.0.12 ENV NEXTCLOUD_VERSION 12.0.13
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -114,7 +114,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; \

8
13.0/apache/Dockerfile
View file

@ -51,9 +51,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -106,7 +106,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 +122,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; \

8
13.0/fpm-alpine/Dockerfile
View file

@ -45,9 +45,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -87,7 +87,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 +101,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; \

8
13.0/fpm/Dockerfile
View file

@ -51,9 +51,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -98,7 +98,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 +114,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; \

8
14.0/apache/Dockerfile
View file

@ -51,9 +51,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -106,7 +106,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 +122,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; \

8
14.0/fpm-alpine/Dockerfile
View file

@ -45,9 +45,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -87,7 +87,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 +101,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; \

8
14.0/fpm/Dockerfile
View file

@ -51,9 +51,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -98,7 +98,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 +114,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; \

8
15.0-beta/apache/Dockerfile → 15.0-rc/apache/Dockerfile
View file

@ -51,9 +51,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -106,7 +106,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip
ENV NEXTCLOUD_VERSION 15.0.0beta1 ENV NEXTCLOUD_VERSION 15.0.0RC1
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -122,7 +122,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/prereleases/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
15.0-beta/apache/config/apache-pretty-urls.config.php → 15.0-rc/apache/config/apache-pretty-urls.config.php
View file

0
15.0-beta/apache/config/apcu.config.php → 15.0-rc/apache/config/apcu.config.php
View file

0
15.0-beta/apache/config/apps.config.php → 15.0-rc/apache/config/apps.config.php
View file

0
15.0-beta/apache/config/autoconfig.php → 15.0-rc/apache/config/autoconfig.php
View file

0
15.0-beta/apache/cron.sh → 15.0-rc/apache/cron.sh
View file

0
15.0-beta/apache/entrypoint.sh → 15.0-rc/apache/entrypoint.sh
View file

0
15.0-beta/apache/upgrade.exclude → 15.0-rc/apache/upgrade.exclude
View file

8
15.0-beta/fpm-alpine/Dockerfile → 15.0-rc/fpm-alpine/Dockerfile
View file

@ -45,9 +45,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -87,7 +87,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 15.0.0beta1 ENV NEXTCLOUD_VERSION 15.0.0RC1
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \
@ -101,7 +101,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/prereleases/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
15.0-beta/fpm-alpine/config/apcu.config.php → 15.0-rc/fpm-alpine/config/apcu.config.php
View file

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

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

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

0
15.0-beta/fpm-alpine/entrypoint.sh → 15.0-rc/fpm-alpine/entrypoint.sh
View file

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

8
15.0-beta/fpm/Dockerfile → 15.0-rc/fpm/Dockerfile
View file

@ -51,9 +51,9 @@ 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.14; \
pecl install memcached-3.0.4; \ pecl install memcached-3.0.4; \
pecl install redis-4.1.1; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -98,7 +98,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 15.0.0beta1 ENV NEXTCLOUD_VERSION 15.0.0RC1
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -114,7 +114,7 @@ RUN set -ex; \
"https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \ "https://download.nextcloud.com/server/prereleases/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
15.0-beta/fpm/config/apcu.config.php → 15.0-rc/fpm/config/apcu.config.php
View file

0
15.0-beta/fpm/config/apps.config.php → 15.0-rc/fpm/config/apps.config.php
View file

0
15.0-beta/fpm/config/autoconfig.php → 15.0-rc/fpm/config/autoconfig.php
View file

0
15.0-beta/fpm/cron.sh → 15.0-rc/fpm/cron.sh
View file

0
15.0-beta/fpm/entrypoint.sh → 15.0-rc/fpm/entrypoint.sh
View file

0
15.0-beta/fpm/upgrade.exclude → 15.0-rc/fpm/upgrade.exclude
View file

2
Dockerfile-alpine.template
View file

@ -100,7 +100,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
Dockerfile-debian.template
View file

@ -113,7 +113,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; \

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")"

15
update.sh
View file

@ -25,9 +25,9 @@ declare -A extras=(
) )
declare -A pecl_versions=( declare -A pecl_versions=(
[APCu]='5.1.12' [APCu]='5.1.14'
[memcached]='3.0.4' [memcached]='3.0.4'
[redis]='4.1.1' [redis]='4.2.0'
) )
variants=( variants=(
@ -97,7 +97,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 +160,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