diff options
| author | Tilo Spannagel <development@tilosp.de> | 2018-05-24 13:50:50 +0200 |
|---|---|---|
| committer | Tilo Spannagel <development@tilosp.de> | 2018-05-24 14:29:37 +0200 |
| commit | 7a5bf34195dd82b0cfa9ce3c5d64055be9d80a45 (patch) | |
| tree | c00ec21b9792bead742d629645ef410518cb34e3 /13.0 | |
| parent | 85a7b1a6ba89b960214e328aa338c1ae9334c7a3 (diff) | |
Run update.sh
Diffstat (limited to '13.0')
| -rw-r--r-- | 13.0/apache/Dockerfile | 16 | ||||
| -rw-r--r-- | 13.0/fpm-alpine/Dockerfile | 2 | ||||
| -rw-r--r-- | 13.0/fpm/Dockerfile | 16 |
3 files changed, 27 insertions, 7 deletions
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index 8e904c57..fedc3765 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.1-apache +FROM php:7.1-apache-stretch # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -30,7 +30,7 @@ RUN set -ex; \ libldap2-dev \ libmcrypt-dev \ libmemcached-dev \ - libpng12-dev \ + libpng-dev \ libpq-dev \ libxml2-dev \ ; \ @@ -105,6 +105,13 @@ RUN a2enmod rewrite remoteip ;\ ENV NEXTCLOUD_VERSION 13.0.2 RUN set -ex; \ + fetchDeps=" \ + gnupg \ + dirmngr \ + "; \ + apt-get update; \ + apt-get install -y --no-install-recommends $fetchDeps; \ + \ curl -fsSL -o nextcloud.tar.bz2 \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ curl -fsSL -o nextcloud.tar.bz2.asc \ @@ -119,7 +126,10 @@ RUN set -ex; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ mkdir -p /usr/src/nextcloud/custom_apps; \ - chmod +x /usr/src/nextcloud/occ + chmod +x /usr/src/nextcloud/occ; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ + rm -rf /var/lib/apt/lists/* COPY *.sh / COPY config/* /usr/src/nextcloud/config/ diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index b63f1f82..47a6784f 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.1-fpm-alpine +FROM php:7.1-fpm-alpine3.7 # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index 66279946..1921c634 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.1-fpm +FROM php:7.1-fpm-stretch # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -30,7 +30,7 @@ RUN set -ex; \ libldap2-dev \ libmcrypt-dev \ libmemcached-dev \ - libpng12-dev \ + libpng-dev \ libpq-dev \ libxml2-dev \ ; \ @@ -97,6 +97,13 @@ VOLUME /var/www/html ENV NEXTCLOUD_VERSION 13.0.2 RUN set -ex; \ + fetchDeps=" \ + gnupg \ + dirmngr \ + "; \ + apt-get update; \ + apt-get install -y --no-install-recommends $fetchDeps; \ + \ curl -fsSL -o nextcloud.tar.bz2 \ "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ curl -fsSL -o nextcloud.tar.bz2.asc \ @@ -111,7 +118,10 @@ RUN set -ex; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ mkdir -p /usr/src/nextcloud/custom_apps; \ - chmod +x /usr/src/nextcloud/occ + chmod +x /usr/src/nextcloud/occ; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ + rm -rf /var/lib/apt/lists/* COPY *.sh / COPY config/* /usr/src/nextcloud/config/ |