Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Nextcloud and add new tags (apache and versions) #2560

Merged
merged 1 commit into from
Jan 21, 2017

Conversation

pierreozoux
Copy link
Contributor

No description provided.

@tianon
Copy link
Member

tianon commented Jan 21, 2017

diff --git a/nextcloud_latest/Dockerfile b/nextcloud_10-fpm/Dockerfile
similarity index 88%
copy from nextcloud_latest/Dockerfile
copy to nextcloud_10-fpm/Dockerfile
index 8a666ad..1a365e6 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_10-fpm/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y \
   libfreetype6-dev \
   libicu-dev \
   libjpeg-dev \
+  libldap2-dev \
   libmcrypt-dev \
   libmemcached-dev \
   libpng12-dev \
@@ -15,7 +16,8 @@ RUN apt-get update && apt-get install -y \
 
 # 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-install gd exif intl mbstring mcrypt mysql opcache pdo_mysql pdo_pgsql pgsql zip
+  && 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
@@ -35,7 +37,7 @@ RUN set -ex \
  && pecl install redis-2.2.8 \
  && docker-php-ext-enable apcu redis memcached
 
-ENV NEXTCLOUD_VERSION 10.0.0
+ENV NEXTCLOUD_VERSION 10.0.3
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
diff --git a/nextcloud_latest/docker-entrypoint.sh b/nextcloud_10-fpm/docker-entrypoint.sh
similarity index 100%
copy from nextcloud_latest/docker-entrypoint.sh
copy to nextcloud_10-fpm/docker-entrypoint.sh
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_10/Dockerfile
similarity index 84%
copy from nextcloud_latest/Dockerfile
copy to nextcloud_10/Dockerfile
index 8a666ad..4356509 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_10/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:5.6-fpm
+FROM php:5.6-apache
 
 RUN apt-get update && apt-get install -y \
   bzip2 \
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y \
   libfreetype6-dev \
   libicu-dev \
   libjpeg-dev \
+  libldap2-dev \
   libmcrypt-dev \
   libmemcached-dev \
   libpng12-dev \
@@ -15,7 +16,8 @@ RUN apt-get update && apt-get install -y \
 
 # 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-install gd exif intl mbstring mcrypt mysql opcache pdo_mysql pdo_pgsql pgsql zip
+  && 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
@@ -27,6 +29,7 @@ RUN { \
     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 \
@@ -34,8 +37,9 @@ RUN set -ex \
  && 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.0
+ENV NEXTCLOUD_VERSION 10.0.3
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
@@ -53,4 +57,4 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
 COPY docker-entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["php-fpm"]
+CMD ["apache2-foreground"]
diff --git a/nextcloud_latest/docker-entrypoint.sh b/nextcloud_10/docker-entrypoint.sh
similarity index 100%
copy from nextcloud_latest/docker-entrypoint.sh
copy to nextcloud_10/docker-entrypoint.sh
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_9-fpm/Dockerfile
similarity index 88%
copy from nextcloud_latest/Dockerfile
copy to nextcloud_9-fpm/Dockerfile
index 8a666ad..9d41eaf 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_9-fpm/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y \
   libfreetype6-dev \
   libicu-dev \
   libjpeg-dev \
+  libldap2-dev \
   libmcrypt-dev \
   libmemcached-dev \
   libpng12-dev \
@@ -15,7 +16,8 @@ RUN apt-get update && apt-get install -y \
 
 # 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-install gd exif intl mbstring mcrypt mysql opcache pdo_mysql pdo_pgsql pgsql zip
+  && 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
@@ -35,7 +37,7 @@ RUN set -ex \
  && pecl install redis-2.2.8 \
  && docker-php-ext-enable apcu redis memcached
 
-ENV NEXTCLOUD_VERSION 10.0.0
+ENV NEXTCLOUD_VERSION 9.0.56
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
diff --git a/nextcloud_latest/docker-entrypoint.sh b/nextcloud_9-fpm/docker-entrypoint.sh
similarity index 100%
copy from nextcloud_latest/docker-entrypoint.sh
copy to nextcloud_9-fpm/docker-entrypoint.sh
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_9/Dockerfile
similarity index 84%
copy from nextcloud_latest/Dockerfile
copy to nextcloud_9/Dockerfile
index 8a666ad..3fead99 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_9/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:5.6-fpm
+FROM php:5.6-apache
 
 RUN apt-get update && apt-get install -y \
   bzip2 \
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y \
   libfreetype6-dev \
   libicu-dev \
   libjpeg-dev \
+  libldap2-dev \
   libmcrypt-dev \
   libmemcached-dev \
   libpng12-dev \
@@ -15,7 +16,8 @@ RUN apt-get update && apt-get install -y \
 
 # 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-install gd exif intl mbstring mcrypt mysql opcache pdo_mysql pdo_pgsql pgsql zip
+  && 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
@@ -27,6 +29,7 @@ RUN { \
     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 \
@@ -34,8 +37,9 @@ RUN set -ex \
  && 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.0
+ENV NEXTCLOUD_VERSION 9.0.56
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
@@ -53,4 +57,4 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
 COPY docker-entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["php-fpm"]
+CMD ["apache2-foreground"]
diff --git a/nextcloud_latest/docker-entrypoint.sh b/nextcloud_9/docker-entrypoint.sh
similarity index 100%
copy from nextcloud_latest/docker-entrypoint.sh
copy to nextcloud_9/docker-entrypoint.sh
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_fpm/Dockerfile
similarity index 88%
copy from nextcloud_latest/Dockerfile
copy to nextcloud_fpm/Dockerfile
index 8a666ad..35c1264 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_fpm/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y \
   libfreetype6-dev \
   libicu-dev \
   libjpeg-dev \
+  libldap2-dev \
   libmcrypt-dev \
   libmemcached-dev \
   libpng12-dev \
@@ -15,7 +16,8 @@ RUN apt-get update && apt-get install -y \
 
 # 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-install gd exif intl mbstring mcrypt mysql opcache pdo_mysql pdo_pgsql pgsql zip
+  && 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
@@ -35,7 +37,7 @@ RUN set -ex \
  && pecl install redis-2.2.8 \
  && docker-php-ext-enable apcu redis memcached
 
-ENV NEXTCLOUD_VERSION 10.0.0
+ENV NEXTCLOUD_VERSION 11.0.1
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
diff --git a/nextcloud_latest/docker-entrypoint.sh b/nextcloud_fpm/docker-entrypoint.sh
similarity index 100%
copy from nextcloud_latest/docker-entrypoint.sh
copy to nextcloud_fpm/docker-entrypoint.sh
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_latest/Dockerfile
index 8a666ad..d645d8b 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:5.6-fpm
+FROM php:5.6-apache
 
 RUN apt-get update && apt-get install -y \
   bzip2 \
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y \
   libfreetype6-dev \
   libicu-dev \
   libjpeg-dev \
+  libldap2-dev \
   libmcrypt-dev \
   libmemcached-dev \
   libpng12-dev \
@@ -15,7 +16,8 @@ RUN apt-get update && apt-get install -y \
 
 # 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-install gd exif intl mbstring mcrypt mysql opcache pdo_mysql pdo_pgsql pgsql zip
+  && 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
@@ -27,6 +29,7 @@ RUN { \
     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 \
@@ -34,8 +37,9 @@ RUN set -ex \
  && 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.0
+ENV NEXTCLOUD_VERSION 11.0.1
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
@@ -53,4 +57,4 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
 COPY docker-entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["php-fpm"]
+CMD ["apache2-foreground"]

@tianon
Copy link
Member

tianon commented Jan 21, 2017

LGTM 👍

Build test of #2560; 8d98c29 (nextcloud):

$ bashbrew build nextcloud:10.0.3-apache
Building bashbrew/cache:b7976596ff764a3175d0244988722990a453f6894a099c96dab4fed1e3dc57b4 (nextcloud:10.0.3-apache)
Tagging nextcloud:10.0.3-apache
Tagging nextcloud:10.0-apache
Tagging nextcloud:10-apache
Tagging nextcloud:10.0.3
Tagging nextcloud:10.0
Tagging nextcloud:10

$ test/run.sh nextcloud:10.0.3-apache
testing nextcloud:10.0.3-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:10.0.3-fpm
Building bashbrew/cache:b1a6069338665161ae230461d1b3a1e29db6c8fa004b3987d09d6d4a154b1f05 (nextcloud:10.0.3-fpm)
Tagging nextcloud:10.0.3-fpm
Tagging nextcloud:10.0-fpm
Tagging nextcloud:10-fpm

$ test/run.sh nextcloud:10.0.3-fpm
testing nextcloud:10.0.3-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:11.0.1-apache
Building bashbrew/cache:f4efb12afeb4ccec4b427dcc67307d05dcfbe81ddde42be3c3353ef994097645 (nextcloud:11.0.1-apache)
Tagging nextcloud:11.0.1-apache
Tagging nextcloud:11.0-apache
Tagging nextcloud:11-apache
Tagging nextcloud:apache
Tagging nextcloud:11.0.1
Tagging nextcloud:11.0
Tagging nextcloud:11
Tagging nextcloud:latest

$ test/run.sh nextcloud:11.0.1-apache
testing nextcloud:11.0.1-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:11.0.1-fpm
Building bashbrew/cache:f62493dbe626ed606cb73ed537fd8a6aeb56c5d39906cf8c384b18a6a9973321 (nextcloud:11.0.1-fpm)
Tagging nextcloud:11.0.1-fpm
Tagging nextcloud:11.0-fpm
Tagging nextcloud:11-fpm
Tagging nextcloud:fpm

$ test/run.sh nextcloud:11.0.1-fpm
testing nextcloud:11.0.1-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:9.0.56-apache
Building bashbrew/cache:e8af9a5cbb14b8d5f848ae048575eb6b0d8431ae0660d1e6b03047b680b178ae (nextcloud:9.0.56-apache)
Tagging nextcloud:9.0.56-apache
Tagging nextcloud:9.0-apache
Tagging nextcloud:9-apache
Tagging nextcloud:9.0.56
Tagging nextcloud:9.0
Tagging nextcloud:9

$ test/run.sh nextcloud:9.0.56-apache
testing nextcloud:9.0.56-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:9.0.56-fpm
Building bashbrew/cache:993d29f7277409cac38075cd962849b028174bf98758112ba7cf7e4ce460ef1c (nextcloud:9.0.56-fpm)
Tagging nextcloud:9.0.56-fpm
Tagging nextcloud:9.0-fpm
Tagging nextcloud:9-fpm

$ test/run.sh nextcloud:9.0.56-fpm
testing nextcloud:9.0.56-fpm
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit ea689c2 into docker-library:master Jan 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants