summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--12.0/apache/Dockerfile16
-rw-r--r--12.0/fpm-alpine/Dockerfile2
-rw-r--r--12.0/fpm/Dockerfile16
-rw-r--r--13.0/apache/Dockerfile16
-rw-r--r--13.0/fpm-alpine/Dockerfile2
-rw-r--r--13.0/fpm/Dockerfile16
6 files changed, 54 insertions, 14 deletions
diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index 870ef192..f1aae06e 100644
--- a/12.0/apache/Dockerfile
+++ b/12.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 12.0.7
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/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile
index 1ea92ef1..6040e83d 100644
--- a/12.0/fpm-alpine/Dockerfile
+++ b/12.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/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index 2556c662..3b1dafb2 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.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 12.0.7
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/
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/