From 3efc37c75601146ad1db8e75430c811a8ec5ef67 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 30 Nov 2016 04:56:52 +1100 Subject: [PATCH] version: move to separate versions and variants In order to match ownCloud's Docker images, we need to provide -apache and -fpm variant images as well as maintaining version tags for older images. These scripts are improved versions of the ownCloud scripts[1] because they also automatically generate the directories with each ./update.sh, and also generate all aliases without needing human intervention. [1]: https://github.com/docker-library/owncloud/blob/master/generate-stackbrew-library.sh Signed-off-by: Aleksa Sarai --- 10.0/apache/Dockerfile | 60 +++++++++++++++++++++++++++++++ 10.0/apache/docker-entrypoint.sh | 9 +++++ Dockerfile => 10.0/fpm/Dockerfile | 2 +- 10.0/fpm/docker-entrypoint.sh | 9 +++++ 11.0/apache/Dockerfile | 60 +++++++++++++++++++++++++++++++ 11.0/apache/docker-entrypoint.sh | 9 +++++ 11.0/fpm/Dockerfile | 58 ++++++++++++++++++++++++++++++ 11.0/fpm/docker-entrypoint.sh | 9 +++++ Dockerfile.template | 60 +++++++++++++++++++++++++++++++ 9 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 10.0/apache/Dockerfile create mode 100755 10.0/apache/docker-entrypoint.sh rename Dockerfile => 10.0/fpm/Dockerfile (98%) create mode 100755 10.0/fpm/docker-entrypoint.sh create mode 100644 11.0/apache/Dockerfile create mode 100755 11.0/apache/docker-entrypoint.sh create mode 100644 11.0/fpm/Dockerfile create mode 100755 11.0/fpm/docker-entrypoint.sh create mode 100644 Dockerfile.template diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile new file mode 100644 index 00000000..1dd12bea --- /dev/null +++ b/10.0/apache/Dockerfile @@ -0,0 +1,60 @@ +FROM php:5.6-apache + +RUN apt-get update && apt-get install -y \ + bzip2 \ + libcurl4-openssl-dev \ + libfreetype6-dev \ + libicu-dev \ + libjpeg-dev \ + libldap2-dev \ + libmcrypt-dev \ + libmemcached-dev \ + libpng12-dev \ + libpq-dev \ + libxml2-dev \ + && rm -rf /var/lib/apt/lists/* + +# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html +RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ + && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + echo 'opcache.enable_cli=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini +RUN a2enmod rewrite + +# PECL extensions +RUN set -ex \ + && pecl install APCu-4.0.10 \ + && pecl install memcached-2.2.0 \ + && pecl install redis-2.2.8 \ + && docker-php-ext-enable apcu redis memcached +RUN a2enmod rewrite + +ENV NEXTCLOUD_VERSION 10.0.2 +VOLUME /var/www/html + +RUN curl -fsSL -o nextcloud.tar.bz2 \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ + && curl -fsSL -o nextcloud.tar.bz2.asc \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ +# gpg key from https://nextcloud.com/nextcloud.asc + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A \ + && gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2 \ + && rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc \ + && tar -xjf nextcloud.tar.bz2 -C /usr/src/ \ + && rm nextcloud.tar.bz2 + +COPY docker-entrypoint.sh /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["apache2-foreground"] diff --git a/10.0/apache/docker-entrypoint.sh b/10.0/apache/docker-entrypoint.sh new file mode 100755 index 00000000..62d16254 --- /dev/null +++ b/10.0/apache/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ ! -e '/var/www/html/version.php' ]; then + tar cf - --one-file-system -C /usr/src/nextcloud . | tar xf - + chown -R www-data /var/www/html +fi + +exec "$@" diff --git a/Dockerfile b/10.0/fpm/Dockerfile similarity index 98% rename from Dockerfile rename to 10.0/fpm/Dockerfile index 4838649d..f5ef1f34 100644 --- a/Dockerfile +++ b/10.0/fpm/Dockerfile @@ -37,7 +37,7 @@ RUN set -ex \ && pecl install redis-2.2.8 \ && docker-php-ext-enable apcu redis memcached -ENV NEXTCLOUD_VERSION 10.0.1 +ENV NEXTCLOUD_VERSION 10.0.2 VOLUME /var/www/html RUN curl -fsSL -o nextcloud.tar.bz2 \ diff --git a/10.0/fpm/docker-entrypoint.sh b/10.0/fpm/docker-entrypoint.sh new file mode 100755 index 00000000..62d16254 --- /dev/null +++ b/10.0/fpm/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ ! -e '/var/www/html/version.php' ]; then + tar cf - --one-file-system -C /usr/src/nextcloud . | tar xf - + chown -R www-data /var/www/html +fi + +exec "$@" diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile new file mode 100644 index 00000000..8c958219 --- /dev/null +++ b/11.0/apache/Dockerfile @@ -0,0 +1,60 @@ +FROM php:5.6-apache + +RUN apt-get update && apt-get install -y \ + bzip2 \ + libcurl4-openssl-dev \ + libfreetype6-dev \ + libicu-dev \ + libjpeg-dev \ + libldap2-dev \ + libmcrypt-dev \ + libmemcached-dev \ + libpng12-dev \ + libpq-dev \ + libxml2-dev \ + && rm -rf /var/lib/apt/lists/* + +# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html +RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ + && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + echo 'opcache.enable_cli=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini +RUN a2enmod rewrite + +# PECL extensions +RUN set -ex \ + && pecl install APCu-4.0.10 \ + && pecl install memcached-2.2.0 \ + && pecl install redis-2.2.8 \ + && docker-php-ext-enable apcu redis memcached +RUN a2enmod rewrite + +ENV NEXTCLOUD_VERSION 11.0.0 +VOLUME /var/www/html + +RUN curl -fsSL -o nextcloud.tar.bz2 \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ + && curl -fsSL -o nextcloud.tar.bz2.asc \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ +# gpg key from https://nextcloud.com/nextcloud.asc + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A \ + && gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2 \ + && rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc \ + && tar -xjf nextcloud.tar.bz2 -C /usr/src/ \ + && rm nextcloud.tar.bz2 + +COPY docker-entrypoint.sh /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["apache2-foreground"] diff --git a/11.0/apache/docker-entrypoint.sh b/11.0/apache/docker-entrypoint.sh new file mode 100755 index 00000000..62d16254 --- /dev/null +++ b/11.0/apache/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ ! -e '/var/www/html/version.php' ]; then + tar cf - --one-file-system -C /usr/src/nextcloud . | tar xf - + chown -R www-data /var/www/html +fi + +exec "$@" diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile new file mode 100644 index 00000000..853d9ef9 --- /dev/null +++ b/11.0/fpm/Dockerfile @@ -0,0 +1,58 @@ +FROM php:5.6-fpm + +RUN apt-get update && apt-get install -y \ + bzip2 \ + libcurl4-openssl-dev \ + libfreetype6-dev \ + libicu-dev \ + libjpeg-dev \ + libldap2-dev \ + libmcrypt-dev \ + libmemcached-dev \ + libpng12-dev \ + libpq-dev \ + libxml2-dev \ + && rm -rf /var/lib/apt/lists/* + +# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html +RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ + && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + echo 'opcache.enable_cli=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +# PECL extensions +RUN set -ex \ + && pecl install APCu-4.0.10 \ + && pecl install memcached-2.2.0 \ + && pecl install redis-2.2.8 \ + && docker-php-ext-enable apcu redis memcached + +ENV NEXTCLOUD_VERSION 11.0.0 +VOLUME /var/www/html + +RUN curl -fsSL -o nextcloud.tar.bz2 \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ + && curl -fsSL -o nextcloud.tar.bz2.asc \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ +# gpg key from https://nextcloud.com/nextcloud.asc + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A \ + && gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2 \ + && rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc \ + && tar -xjf nextcloud.tar.bz2 -C /usr/src/ \ + && rm nextcloud.tar.bz2 + +COPY docker-entrypoint.sh /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["php-fpm"] diff --git a/11.0/fpm/docker-entrypoint.sh b/11.0/fpm/docker-entrypoint.sh new file mode 100755 index 00000000..62d16254 --- /dev/null +++ b/11.0/fpm/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ ! -e '/var/www/html/version.php' ]; then + tar cf - --one-file-system -C /usr/src/nextcloud . | tar xf - + chown -R www-data /var/www/html +fi + +exec "$@" diff --git a/Dockerfile.template b/Dockerfile.template new file mode 100644 index 00000000..3d713793 --- /dev/null +++ b/Dockerfile.template @@ -0,0 +1,60 @@ +FROM php:5.6-%%VARIANT%% + +RUN apt-get update && apt-get install -y \ + bzip2 \ + libcurl4-openssl-dev \ + libfreetype6-dev \ + libicu-dev \ + libjpeg-dev \ + libldap2-dev \ + libmcrypt-dev \ + libmemcached-dev \ + libpng12-dev \ + libpq-dev \ + libxml2-dev \ + && rm -rf /var/lib/apt/lists/* + +# https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html +RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ + && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + echo 'opcache.enable_cli=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini +RUN a2enmod rewrite + +# PECL extensions +RUN set -ex \ + && pecl install APCu-4.0.10 \ + && pecl install memcached-2.2.0 \ + && pecl install redis-2.2.8 \ + && docker-php-ext-enable apcu redis memcached +RUN a2enmod rewrite + +ENV NEXTCLOUD_VERSION %%VERSION%% +VOLUME /var/www/html + +RUN curl -fsSL -o nextcloud.tar.bz2 \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ + && curl -fsSL -o nextcloud.tar.bz2.asc \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ +# gpg key from https://nextcloud.com/nextcloud.asc + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A \ + && gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2 \ + && rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc \ + && tar -xjf nextcloud.tar.bz2 -C /usr/src/ \ + && rm nextcloud.tar.bz2 + +COPY docker-entrypoint.sh /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["%%CMD%%"]