Update nextcloud image #4390
Merged
Update nextcloud image #4390
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 1ba46ca..3ffc32f 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -13,6 +13,11 @@ nextcloud:12-fpm @ i386
nextcloud:12-fpm @ ppc64le
nextcloud:12-fpm @ s390x
nextcloud:12-fpm-alpine @ amd64
+nextcloud:12-fpm-alpine @ arm32v6
+nextcloud:12-fpm-alpine @ arm64v8
+nextcloud:12-fpm-alpine @ i386
+nextcloud:12-fpm-alpine @ ppc64le
+nextcloud:12-fpm-alpine @ s390x
nextcloud:production @ amd64
nextcloud:production @ arm32v5
nextcloud:production @ arm32v7
@@ -28,3 +33,8 @@ nextcloud:production-fpm @ i386
nextcloud:production-fpm @ ppc64le
nextcloud:production-fpm @ s390x
nextcloud:production-fpm-alpine @ amd64
+nextcloud:production-fpm-alpine @ arm32v6
+nextcloud:production-fpm-alpine @ arm64v8
+nextcloud:production-fpm-alpine @ i386
+nextcloud:production-fpm-alpine @ ppc64le
+nextcloud:production-fpm-alpine @ s390x
diff --git a/nextcloud_12-fpm-alpine/Dockerfile b/nextcloud_12-fpm-alpine/Dockerfile
index 1ea92ef..6040e83 100644
--- a/nextcloud_12-fpm-alpine/Dockerfile
+++ b/nextcloud_12-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/nextcloud_12-fpm/Dockerfile b/nextcloud_12-fpm/Dockerfile
index 2556c66..3b1dafb 100644
--- a/nextcloud_12-fpm/Dockerfile
+++ b/nextcloud_12-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/nextcloud_12/Dockerfile b/nextcloud_12/Dockerfile
index 870ef19..f1aae06 100644
--- a/nextcloud_12/Dockerfile
+++ b/nextcloud_12/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/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
index b63f1f8..47a6784 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_production-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/nextcloud_production-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
index 6627994..1921c63 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_production-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/
diff --git a/nextcloud_production/Dockerfile b/nextcloud_production/Dockerfile
index 8e904c5..fedc376 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_production/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/ |
|
Build test of #4390; 4c51455; $ bashbrew build nextcloud:12.0.7-apache
Building bashbrew/cache:d6b0298ee266cb135695e725f701c8cf83fcc9cf2ce48deec93a7a1f1e5cd782 (nextcloud:12.0.7-apache)
Tagging nextcloud:12.0.7-apache
Tagging nextcloud:12.0-apache
Tagging nextcloud:12-apache
Tagging nextcloud:12.0.7
Tagging nextcloud:12.0
Tagging nextcloud:12
$ test/run.sh nextcloud:12.0.7-apache
testing nextcloud:12.0.7-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:12.0.7-fpm
Building bashbrew/cache:9e2cb5db1c0b1f20420633258c248cceacecc80abd6109ee1de8c515117bd0ce (nextcloud:12.0.7-fpm)
Tagging nextcloud:12.0.7-fpm
Tagging nextcloud:12.0-fpm
Tagging nextcloud:12-fpm
$ test/run.sh nextcloud:12.0.7-fpm
testing nextcloud:12.0.7-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:12.0.7-fpm-alpine
Building bashbrew/cache:49b31be0225fcaa04e3ca98eeef0228c4df076e49458911ac05de52a7ca45f28 (nextcloud:12.0.7-fpm-alpine)
Tagging nextcloud:12.0.7-fpm-alpine
Tagging nextcloud:12.0-fpm-alpine
Tagging nextcloud:12-fpm-alpine
$ test/run.sh nextcloud:12.0.7-fpm-alpine
testing nextcloud:12.0.7-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:13.0.2-apache
Building bashbrew/cache:20fe3ddf4efc3853c19e16f536b0c34cb35cb76c004360b2abd5a08dfa4c6579 (nextcloud:13.0.2-apache)
Tagging nextcloud:13.0.2-apache
Tagging nextcloud:13.0-apache
Tagging nextcloud:13-apache
Tagging nextcloud:apache
Tagging nextcloud:stable-apache
Tagging nextcloud:production-apache
Tagging nextcloud:13.0.2
Tagging nextcloud:13.0
Tagging nextcloud:13
Tagging nextcloud:latest
Tagging nextcloud:stable
Tagging nextcloud:production
$ test/run.sh nextcloud:13.0.2-apache
testing nextcloud:13.0.2-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:13.0.2-fpm
Building bashbrew/cache:9e0b1f12621ab91221778950d91079a7d49f115b11250dd84af3976dc5e858a1 (nextcloud:13.0.2-fpm)
Tagging nextcloud:13.0.2-fpm
Tagging nextcloud:13.0-fpm
Tagging nextcloud:13-fpm
Tagging nextcloud:fpm
Tagging nextcloud:stable-fpm
Tagging nextcloud:production-fpm
$ test/run.sh nextcloud:13.0.2-fpm
testing nextcloud:13.0.2-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:13.0.2-fpm-alpine
Building bashbrew/cache:e39d10e0505d7c7309853b495b53cda247be268099d35aa9979145ee80d49d51 (nextcloud:13.0.2-fpm-alpine)
Tagging nextcloud:13.0.2-fpm-alpine
Tagging nextcloud:13.0-fpm-alpine
Tagging nextcloud:13-fpm-alpine
Tagging nextcloud:fpm-alpine
Tagging nextcloud:stable-fpm-alpine
Tagging nextcloud:production-fpm-alpine
$ test/run.sh nextcloud:13.0.2-fpm-alpine
testing nextcloud:13.0.2-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
nextcloud/docker#342