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 #4 from nextcloud/master

Browse source 
Merge back master
This commit is contained in:
kgw4it 2018-12-10 14:23:52 +01:00 • committed by GitHub
commit 84828c6c69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -56,12 +56,6 @@ jobs:
- env: VERSION=15.0-rc VARIANT=fpm ARCH=i386 - env: VERSION=15.0-rc VARIANT=fpm ARCH=i386
- env: VERSION=15.0-rc VARIANT=apache ARCH=amd64 - env: VERSION=15.0-rc VARIANT=apache ARCH=amd64
- env: VERSION=15.0-rc 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=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=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

2
15.0-rc/apache/Dockerfile
View file

@ -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.0RC1 ENV NEXTCLOUD_VERSION 15.0.0RC3
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

2
15.0-rc/fpm-alpine/Dockerfile
View file

@ -87,7 +87,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 15.0.0RC1 ENV NEXTCLOUD_VERSION 15.0.0RC3
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \

2
15.0-rc/fpm/Dockerfile
View file

@ -98,7 +98,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 15.0.0RC1 ENV NEXTCLOUD_VERSION 15.0.0RC3
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

4
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; \
@ -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.13 ENV NEXTCLOUD_VERSION 15.0.0
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

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

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

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

4
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; \
@ -87,7 +87,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 12.0.13 ENV NEXTCLOUD_VERSION 15.0.0
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \

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

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

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

4
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; \
@ -98,7 +98,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 12.0.13 ENV NEXTCLOUD_VERSION 15.0.0
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

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

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

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

2
update.sh
View file

@ -36,7 +36,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() {