mirror of
				https://github.com/nextcloud/docker.git
				synced 2025-10-30 07:51:33 +01:00 
			
		
		
		
	Merge pull request #342 from nextcloud/stretch-and-3.7
Move to a debian stretch and alpine 3.7 based base image
This commit is contained in:
		
						commit
						81e5468c73
					
				| @ -1,5 +1,5 @@ | |||||||
| # DO NOT EDIT: created by update.sh from Dockerfile-debian.template | # 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 | # entrypoint.sh and cron.sh dependencies | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
| @ -30,7 +30,7 @@ RUN set -ex; \ | |||||||
|         libldap2-dev \ |         libldap2-dev \ | ||||||
|         libmcrypt-dev \ |         libmcrypt-dev \ | ||||||
|         libmemcached-dev \ |         libmemcached-dev \ | ||||||
|         libpng12-dev \ |         libpng-dev \ | ||||||
|         libpq-dev \ |         libpq-dev \ | ||||||
|         libxml2-dev \ |         libxml2-dev \ | ||||||
|     ; \ |     ; \ | ||||||
| @ -105,6 +105,13 @@ RUN a2enmod rewrite remoteip ;\ | |||||||
| ENV NEXTCLOUD_VERSION 12.0.7 | ENV NEXTCLOUD_VERSION 12.0.7 | ||||||
| 
 | 
 | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
|  |     fetchDeps=" \ | ||||||
|  |         gnupg \ | ||||||
|  |         dirmngr \ | ||||||
|  |     "; \ | ||||||
|  |     apt-get update; \ | ||||||
|  |     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/releases/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 \ | ||||||
| @ -119,7 +126,10 @@ RUN set -ex; \ | |||||||
|     rm -rf /usr/src/nextcloud/updater; \ |     rm -rf /usr/src/nextcloud/updater; \ | ||||||
|     mkdir -p /usr/src/nextcloud/data; \ |     mkdir -p /usr/src/nextcloud/data; \ | ||||||
|     mkdir -p /usr/src/nextcloud/custom_apps; \ |     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 *.sh / | ||||||
| COPY config/* /usr/src/nextcloud/config/ | COPY config/* /usr/src/nextcloud/config/ | ||||||
|  | |||||||
| @ -1,5 +1,5 @@ | |||||||
| # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template | # 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 | # entrypoint.sh and cron.sh dependencies | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
|  | |||||||
| @ -1,5 +1,5 @@ | |||||||
| # DO NOT EDIT: created by update.sh from Dockerfile-debian.template | # 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 | # entrypoint.sh and cron.sh dependencies | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
| @ -30,7 +30,7 @@ RUN set -ex; \ | |||||||
|         libldap2-dev \ |         libldap2-dev \ | ||||||
|         libmcrypt-dev \ |         libmcrypt-dev \ | ||||||
|         libmemcached-dev \ |         libmemcached-dev \ | ||||||
|         libpng12-dev \ |         libpng-dev \ | ||||||
|         libpq-dev \ |         libpq-dev \ | ||||||
|         libxml2-dev \ |         libxml2-dev \ | ||||||
|     ; \ |     ; \ | ||||||
| @ -97,6 +97,13 @@ VOLUME /var/www/html | |||||||
| ENV NEXTCLOUD_VERSION 12.0.7 | ENV NEXTCLOUD_VERSION 12.0.7 | ||||||
| 
 | 
 | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
|  |     fetchDeps=" \ | ||||||
|  |         gnupg \ | ||||||
|  |         dirmngr \ | ||||||
|  |     "; \ | ||||||
|  |     apt-get update; \ | ||||||
|  |     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/releases/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 \ | ||||||
| @ -111,7 +118,10 @@ RUN set -ex; \ | |||||||
|     rm -rf /usr/src/nextcloud/updater; \ |     rm -rf /usr/src/nextcloud/updater; \ | ||||||
|     mkdir -p /usr/src/nextcloud/data; \ |     mkdir -p /usr/src/nextcloud/data; \ | ||||||
|     mkdir -p /usr/src/nextcloud/custom_apps; \ |     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 *.sh / | ||||||
| COPY config/* /usr/src/nextcloud/config/ | COPY config/* /usr/src/nextcloud/config/ | ||||||
|  | |||||||
| @ -1,5 +1,5 @@ | |||||||
| # DO NOT EDIT: created by update.sh from Dockerfile-debian.template | # 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 | # entrypoint.sh and cron.sh dependencies | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
| @ -30,7 +30,7 @@ RUN set -ex; \ | |||||||
|         libldap2-dev \ |         libldap2-dev \ | ||||||
|         libmcrypt-dev \ |         libmcrypt-dev \ | ||||||
|         libmemcached-dev \ |         libmemcached-dev \ | ||||||
|         libpng12-dev \ |         libpng-dev \ | ||||||
|         libpq-dev \ |         libpq-dev \ | ||||||
|         libxml2-dev \ |         libxml2-dev \ | ||||||
|     ; \ |     ; \ | ||||||
| @ -105,6 +105,13 @@ RUN a2enmod rewrite remoteip ;\ | |||||||
| ENV NEXTCLOUD_VERSION 13.0.2 | ENV NEXTCLOUD_VERSION 13.0.2 | ||||||
| 
 | 
 | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
|  |     fetchDeps=" \ | ||||||
|  |         gnupg \ | ||||||
|  |         dirmngr \ | ||||||
|  |     "; \ | ||||||
|  |     apt-get update; \ | ||||||
|  |     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/releases/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 \ | ||||||
| @ -119,7 +126,10 @@ RUN set -ex; \ | |||||||
|     rm -rf /usr/src/nextcloud/updater; \ |     rm -rf /usr/src/nextcloud/updater; \ | ||||||
|     mkdir -p /usr/src/nextcloud/data; \ |     mkdir -p /usr/src/nextcloud/data; \ | ||||||
|     mkdir -p /usr/src/nextcloud/custom_apps; \ |     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 *.sh / | ||||||
| COPY config/* /usr/src/nextcloud/config/ | COPY config/* /usr/src/nextcloud/config/ | ||||||
|  | |||||||
| @ -1,5 +1,5 @@ | |||||||
| # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template | # 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 | # entrypoint.sh and cron.sh dependencies | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
|  | |||||||
| @ -1,5 +1,5 @@ | |||||||
| # DO NOT EDIT: created by update.sh from Dockerfile-debian.template | # 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 | # entrypoint.sh and cron.sh dependencies | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
| @ -30,7 +30,7 @@ RUN set -ex; \ | |||||||
|         libldap2-dev \ |         libldap2-dev \ | ||||||
|         libmcrypt-dev \ |         libmcrypt-dev \ | ||||||
|         libmemcached-dev \ |         libmemcached-dev \ | ||||||
|         libpng12-dev \ |         libpng-dev \ | ||||||
|         libpq-dev \ |         libpq-dev \ | ||||||
|         libxml2-dev \ |         libxml2-dev \ | ||||||
|     ; \ |     ; \ | ||||||
| @ -97,6 +97,13 @@ VOLUME /var/www/html | |||||||
| ENV NEXTCLOUD_VERSION 13.0.2 | ENV NEXTCLOUD_VERSION 13.0.2 | ||||||
| 
 | 
 | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
|  |     fetchDeps=" \ | ||||||
|  |         gnupg \ | ||||||
|  |         dirmngr \ | ||||||
|  |     "; \ | ||||||
|  |     apt-get update; \ | ||||||
|  |     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/releases/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 \ | ||||||
| @ -111,7 +118,10 @@ RUN set -ex; \ | |||||||
|     rm -rf /usr/src/nextcloud/updater; \ |     rm -rf /usr/src/nextcloud/updater; \ | ||||||
|     mkdir -p /usr/src/nextcloud/data; \ |     mkdir -p /usr/src/nextcloud/data; \ | ||||||
|     mkdir -p /usr/src/nextcloud/custom_apps; \ |     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 *.sh / | ||||||
| COPY config/* /usr/src/nextcloud/config/ | COPY config/* /usr/src/nextcloud/config/ | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| FROM php:%%PHP_VERSION%%-%%VARIANT%% | FROM php:%%PHP_VERSION%%-%%VARIANT%%3.7 | ||||||
| 
 | 
 | ||||||
| # entrypoint.sh and cron.sh dependencies | # entrypoint.sh and cron.sh dependencies | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| FROM php:%%PHP_VERSION%%-%%VARIANT%% | FROM php:%%PHP_VERSION%%-%%VARIANT%%-stretch | ||||||
| 
 | 
 | ||||||
| # entrypoint.sh and cron.sh dependencies | # entrypoint.sh and cron.sh dependencies | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
| @ -29,7 +29,7 @@ RUN set -ex; \ | |||||||
|         libldap2-dev \ |         libldap2-dev \ | ||||||
|         libmcrypt-dev \ |         libmcrypt-dev \ | ||||||
|         libmemcached-dev \ |         libmemcached-dev \ | ||||||
|         libpng12-dev \ |         libpng-dev \ | ||||||
|         libpq-dev \ |         libpq-dev \ | ||||||
|         libxml2-dev \ |         libxml2-dev \ | ||||||
|     ; \ |     ; \ | ||||||
| @ -96,6 +96,13 @@ VOLUME /var/www/html | |||||||
| ENV NEXTCLOUD_VERSION %%VERSION%% | ENV NEXTCLOUD_VERSION %%VERSION%% | ||||||
| 
 | 
 | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
|  |     fetchDeps=" \ | ||||||
|  |         gnupg \ | ||||||
|  |         dirmngr \ | ||||||
|  |     "; \ | ||||||
|  |     apt-get update; \ | ||||||
|  |     apt-get install -y --no-install-recommends $fetchDeps; \ | ||||||
|  |     \ | ||||||
|     curl -fsSL -o nextcloud.tar.bz2 \ |     curl -fsSL -o nextcloud.tar.bz2 \ | ||||||
|         "%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ |         "%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ | ||||||
|     curl -fsSL -o nextcloud.tar.bz2.asc \ |     curl -fsSL -o nextcloud.tar.bz2.asc \ | ||||||
| @ -110,7 +117,10 @@ RUN set -ex; \ | |||||||
|     rm -rf /usr/src/nextcloud/updater; \ |     rm -rf /usr/src/nextcloud/updater; \ | ||||||
|     mkdir -p /usr/src/nextcloud/data; \ |     mkdir -p /usr/src/nextcloud/data; \ | ||||||
|     mkdir -p /usr/src/nextcloud/custom_apps; \ |     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 *.sh / | ||||||
| COPY config/* /usr/src/nextcloud/config/ | COPY config/* /usr/src/nextcloud/config/ | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user