aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-02-09 04:38:27 +01:00
Code Activity

Run update.sh (#1132)

Browse source 
* Run update.sh

Signed-off-by: tilosp-bot <git-bot@tilosp.de>

* Run update.sh

Signed-off-by: tilosp-bot <git-bot@tilosp.de>

* Run update.sh

Signed-off-by: tilosp-bot <git-bot@tilosp.de>

* Add bmath for 19.0 (fix ##1122 and #1137)

Signed-off-by: J0WI <J0WI@users.noreply.github.com>

Co-authored-by: J0WI <J0WI@users.noreply.github.com>
This commit is contained in:
tilosp-bot 2020-06-04 22:50:41 +02:00 committed by GitHub
parent ba1500b05e
commit a229b17bca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 40 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.travis.yml
View file

@ -68,13 +68,7 @@ jobs:
- travis_retry ./generate-stackbrew-library.sh - travis_retry ./generate-stackbrew-library.sh
- stage: test images - stage: test images
env: VERSION=19.0-rc VARIANT=fpm-alpine ARCH=amd64 env: VERSION=16.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=19.0-rc VARIANT=fpm-alpine ARCH=i386
- env: VERSION=19.0-rc VARIANT=fpm ARCH=amd64
- env: VERSION=19.0-rc VARIANT=fpm ARCH=i386
- env: VERSION=19.0-rc VARIANT=apache ARCH=amd64
- env: VERSION=19.0-rc VARIANT=apache ARCH=i386
- env: VERSION=16.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=16.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=16.0 VARIANT=fpm-alpine ARCH=i386
- env: VERSION=16.0 VARIANT=fpm ARCH=amd64 - env: VERSION=16.0 VARIANT=fpm ARCH=amd64
- env: VERSION=16.0 VARIANT=fpm ARCH=i386 - env: VERSION=16.0 VARIANT=fpm ARCH=i386
@ -92,3 +86,9 @@ jobs:
- env: VERSION=18.0 VARIANT=fpm ARCH=i386 - env: VERSION=18.0 VARIANT=fpm ARCH=i386
- env: VERSION=18.0 VARIANT=apache ARCH=amd64 - env: VERSION=18.0 VARIANT=apache ARCH=amd64
- env: VERSION=18.0 VARIANT=apache ARCH=i386 - env: VERSION=18.0 VARIANT=apache ARCH=i386
- env: VERSION=19.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=19.0 VARIANT=fpm-alpine ARCH=i386
- env: VERSION=19.0 VARIANT=fpm ARCH=amd64
- env: VERSION=19.0 VARIANT=fpm ARCH=i386
- env: VERSION=19.0 VARIANT=apache ARCH=amd64
- env: VERSION=19.0 VARIANT=apache ARCH=i386

2
16.0/apache/Dockerfile
View file

@ -115,7 +115,7 @@ RUN a2enmod headers rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip
ENV NEXTCLOUD_VERSION 16.0.10 ENV NEXTCLOUD_VERSION 16.0.11
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

2
16.0/fpm-alpine/Dockerfile
View file

@ -94,7 +94,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 16.0.10 ENV NEXTCLOUD_VERSION 16.0.11
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \

2
16.0/fpm/Dockerfile
View file

@ -107,7 +107,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 16.0.10 ENV NEXTCLOUD_VERSION 16.0.11
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

2
17.0/apache/Dockerfile
View file

@ -115,7 +115,7 @@ RUN a2enmod headers rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip
ENV NEXTCLOUD_VERSION 17.0.6 ENV NEXTCLOUD_VERSION 17.0.7
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

2
17.0/fpm-alpine/Dockerfile
View file

@ -94,7 +94,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 17.0.6 ENV NEXTCLOUD_VERSION 17.0.7
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \

2
17.0/fpm/Dockerfile
View file

@ -107,7 +107,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 17.0.6 ENV NEXTCLOUD_VERSION 17.0.7
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

2
18.0/apache/Dockerfile
View file

@ -115,7 +115,7 @@ RUN a2enmod headers rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip
ENV NEXTCLOUD_VERSION 18.0.4 ENV NEXTCLOUD_VERSION 18.0.5
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

2
18.0/fpm-alpine/Dockerfile
View file

@ -94,7 +94,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 18.0.4 ENV NEXTCLOUD_VERSION 18.0.5
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \

2
18.0/fpm/Dockerfile
View file

@ -107,7 +107,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 18.0.4 ENV NEXTCLOUD_VERSION 18.0.5
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

7
19.0-rc/apache/Dockerfile → 19.0/apache/Dockerfile
View file

@ -44,6 +44,7 @@ RUN set -ex; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \ exif \
gd \ gd \
intl \ intl \
@ -113,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip
ENV NEXTCLOUD_VERSION 19.0.0RC3 ENV NEXTCLOUD_VERSION 19.0.0
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -124,9 +125,9 @@ RUN set -ex; \
apt-get install -y --no-install-recommends $fetchDeps; \ apt-get install -y --no-install-recommends $fetchDeps; \
\ \
curl -fsSL -o nextcloud.tar.bz2 \ curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/prereleases/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 \
"https://download.nextcloud.com/server/prereleases/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 --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

0
19.0-rc/apache/config/apache-pretty-urls.config.php → 19.0/apache/config/apache-pretty-urls.config.php
View file

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

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

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

0
19.0-rc/apache/config/redis.config.php → 19.0/apache/config/redis.config.php
View file

0
19.0-rc/apache/config/reverse-proxy.config.php → 19.0/apache/config/reverse-proxy.config.php
View file

0
19.0-rc/apache/config/smtp.config.php → 19.0/apache/config/smtp.config.php
View file

0
19.0-rc/apache/cron.sh → 19.0/apache/cron.sh
View file

0
19.0-rc/apache/entrypoint.sh → 19.0/apache/entrypoint.sh
View file

0
19.0-rc/apache/upgrade.exclude → 19.0/apache/upgrade.exclude
View file

7
19.0-rc/fpm-alpine/Dockerfile → 19.0/fpm-alpine/Dockerfile
View file

@ -38,6 +38,7 @@ RUN set -ex; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure ldap; \ docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \ exif \
gd \ gd \
intl \ intl \
@ -94,7 +95,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 19.0.0RC3 ENV NEXTCLOUD_VERSION 19.0.0
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \
@ -103,9 +104,9 @@ RUN set -ex; \
; \ ; \
\ \
curl -fsSL -o nextcloud.tar.bz2 \ curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/prereleases/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 \
"https://download.nextcloud.com/server/prereleases/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 --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

0
19.0-rc/fpm-alpine/config/apcu.config.php → 19.0/fpm-alpine/config/apcu.config.php
View file

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

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

0
19.0-rc/fpm-alpine/config/redis.config.php → 19.0/fpm-alpine/config/redis.config.php
View file

0
19.0-rc/fpm-alpine/config/reverse-proxy.config.php → 19.0/fpm-alpine/config/reverse-proxy.config.php
View file

0
19.0-rc/fpm-alpine/config/smtp.config.php → 19.0/fpm-alpine/config/smtp.config.php
View file

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

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

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

7
19.0-rc/fpm/Dockerfile → 19.0/fpm/Dockerfile
View file

@ -44,6 +44,7 @@ RUN set -ex; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \ exif \
gd \ gd \
intl \ intl \
@ -105,7 +106,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 19.0.0RC3 ENV NEXTCLOUD_VERSION 19.0.0
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -116,9 +117,9 @@ RUN set -ex; \
apt-get install -y --no-install-recommends $fetchDeps; \ apt-get install -y --no-install-recommends $fetchDeps; \
\ \
curl -fsSL -o nextcloud.tar.bz2 \ curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/prereleases/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 \
"https://download.nextcloud.com/server/prereleases/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 --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

0
19.0-rc/fpm/config/apcu.config.php → 19.0/fpm/config/apcu.config.php
View file

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

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

0
19.0-rc/fpm/config/redis.config.php → 19.0/fpm/config/redis.config.php
View file

0
19.0-rc/fpm/config/reverse-proxy.config.php → 19.0/fpm/config/reverse-proxy.config.php
View file

0
19.0-rc/fpm/config/smtp.config.php → 19.0/fpm/config/smtp.config.php
View file

0
19.0-rc/fpm/cron.sh → 19.0/fpm/cron.sh
View file

0
19.0-rc/fpm/entrypoint.sh → 19.0/fpm/entrypoint.sh
View file

0
19.0-rc/fpm/upgrade.exclude → 19.0/fpm/upgrade.exclude
View file

1
Dockerfile-alpine.template
View file

@ -37,6 +37,7 @@ RUN set -ex; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure ldap; \ docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \ exif \
gd \ gd \
intl \ intl \

1
Dockerfile-debian.template
View file

@ -45,6 +45,7 @@ RUN set -ex; \
docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \ docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
bcmath \
exif \ exif \
gd \ gd \
intl \ intl \

2
latest.txt
View file

@ -1 +1 @@
18.0.4 19.0.0

9
update.sh
View file

@ -147,6 +147,15 @@ function create_variant() {
;; ;;
esac esac
case "$version" in
16.*|17.*|18.* )
sed -ri -e '
\@bcmath@d;
' "$dir/Dockerfile"
;;
esac
# Copy the shell scripts # Copy the shell scripts
for name in entrypoint cron; do for name in entrypoint cron; do
cp "docker-$name.sh" "$dir/$name.sh" cp "docker-$name.sh" "$dir/$name.sh"