From 9d6413f954344a96db796181b0bf1c3b85946ca2 Mon Sep 17 00:00:00 2001 From: marceljd Date: Thu, 7 Feb 2019 14:46:31 +0000 Subject: [PATCH] On branch apache-ssl Changes to be committed: modified: 13.0/apache/Dockerfile modified: 13.0/fpm/Dockerfile modified: 14.0/apache/Dockerfile modified: 14.0/fpm/Dockerfile modified: 15.0/apache/Dockerfile modified: 15.0/fpm/Dockerfile modified: Dockerfile-debian.template Untracked files: .config/000-default.conf 13.0/apache/config/000-default.conf 13.0/fpm-alpine/config/000-default.conf 13.0/fpm/config/000-default.conf 14.0/apache/config/000-default.conf 14.0/fpm-alpine/config/000-default.conf 14.0/fpm/config/000-default.conf 15.0/apache/config/000-default.conf 15.0/fpm-alpine/config/000-default.conf 15.0/fpm/config/000-default.conf Signed-off-by: marceljd --- 13.0/apache/Dockerfile | 2 +- 13.0/fpm/Dockerfile | 2 +- 14.0/apache/Dockerfile | 2 +- 14.0/fpm/Dockerfile | 2 +- 15.0/apache/Dockerfile | 2 +- 15.0/fpm/Dockerfile | 2 +- Dockerfile-debian.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index 6d563b32..605f2861 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -137,7 +137,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* \ \ mkdir -p /usr/src/apache diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index 5b7382fb..3a391ee2 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -129,7 +129,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* \ \ mkdir -p /usr/src/apache diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile index 7b14e973..a7ae6395 100644 --- a/14.0/apache/Dockerfile +++ b/14.0/apache/Dockerfile @@ -137,7 +137,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* \ \ mkdir -p /usr/src/apache diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile index 9ff401ad..16defcc0 100644 --- a/14.0/fpm/Dockerfile +++ b/14.0/fpm/Dockerfile @@ -129,7 +129,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* \ \ mkdir -p /usr/src/apache diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile index 87e41768..f2580052 100644 --- a/15.0/apache/Dockerfile +++ b/15.0/apache/Dockerfile @@ -137,7 +137,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* \ \ mkdir -p /usr/src/apache diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile index 4f37e27b..38b58e7b 100644 --- a/15.0/fpm/Dockerfile +++ b/15.0/fpm/Dockerfile @@ -129,7 +129,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* \ \ mkdir -p /usr/src/apache diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 3050bcc6..8da0d510 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -129,7 +129,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* \ \ mkdir -p /usr/src/apache