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 docker-library images #2742

Merged
merged 1 commit into from
Mar 13, 2017

Conversation

tianon
Copy link
Member

@tianon tianon commented Mar 13, 2017

- `cassandra`: 3.0.12
- `irssi`: 1.0.2
- `nextcloud`: 9.0.57, 10.0.4 and 11.0.2 (nextcloud/docker#41)
@tianon
Copy link
Member Author

tianon commented Mar 13, 2017

diff --git a/_bashbrew-list b/_bashbrew-list
index 134b10b..2186959 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,15 +5,15 @@ cassandra:2.2
 cassandra:2.2.9
 cassandra:3
 cassandra:3.0
-cassandra:3.0.11
+cassandra:3.0.12
 cassandra:3.10
 cassandra:latest
 irssi:1
 irssi:1-alpine
 irssi:1.0
 irssi:1.0-alpine
-irssi:1.0.1
-irssi:1.0.1-alpine
+irssi:1.0.2
+irssi:1.0.2-alpine
 irssi:alpine
 irssi:latest
 nextcloud:9
@@ -22,27 +22,24 @@ nextcloud:9-fpm
 nextcloud:9.0
 nextcloud:9.0-apache
 nextcloud:9.0-fpm
-nextcloud:9.0.56
-nextcloud:9.0.56-apache
-nextcloud:9.0.56-fpm
+nextcloud:9.0.57
+nextcloud:9.0.57-apache
+nextcloud:9.0.57-fpm
 nextcloud:10
 nextcloud:10-apache
 nextcloud:10-fpm
 nextcloud:10.0
 nextcloud:10.0-apache
 nextcloud:10.0-fpm
-nextcloud:10.0.3
-nextcloud:10.0.3-apache
-nextcloud:10.0.3-fpm
+nextcloud:10.0.4
+nextcloud:10.0.4-apache
+nextcloud:10.0.4-fpm
 nextcloud:11
 nextcloud:11-apache
 nextcloud:11-fpm
 nextcloud:11.0
 nextcloud:11.0-apache
 nextcloud:11.0-fpm
-nextcloud:11.0.1
-nextcloud:11.0.1-apache
-nextcloud:11.0.1-fpm
-nextcloud:apache
-nextcloud:fpm
-nextcloud:latest
+nextcloud:11.0.2
+nextcloud:11.0.2-apache
+nextcloud:11.0.2-fpm
diff --git a/cassandra_3.0/Dockerfile b/cassandra_3.0/Dockerfile
index 349cce3..fc837ab 100644
--- a/cassandra_3.0/Dockerfile
+++ b/cassandra_3.0/Dockerfile
@@ -45,7 +45,7 @@ RUN set -ex; \
 
 RUN echo 'deb http://www.apache.org/dist/cassandra/debian 30x main' >> /etc/apt/sources.list.d/cassandra.list
 
-ENV CASSANDRA_VERSION 3.0.11
+ENV CASSANDRA_VERSION 3.0.12
 
 RUN apt-get update \
 	&& apt-get install -y \
diff --git a/irssi_alpine/Dockerfile b/irssi_alpine/Dockerfile
index 27c8a62..cf42af7 100644
--- a/irssi_alpine/Dockerfile
+++ b/irssi_alpine/Dockerfile
@@ -10,7 +10,7 @@ RUN adduser -u 1001 -D user \
 
 ENV LANG C.UTF-8
 
-ENV IRSSI_VERSION 1.0.1
+ENV IRSSI_VERSION 1.0.2
 
 RUN set -x \
 	&& apk add --no-cache --virtual .build-deps \
diff --git a/irssi_latest/Dockerfile b/irssi_latest/Dockerfile
index afeb5f2..f2b0ad8 100644
--- a/irssi_latest/Dockerfile
+++ b/irssi_latest/Dockerfile
@@ -16,7 +16,7 @@ RUN useradd --create-home --home-dir $HOME user \
 
 ENV LANG C.UTF-8
 
-ENV IRSSI_VERSION 1.0.1
+ENV IRSSI_VERSION 1.0.2
 
 RUN buildDeps=' \
 		autoconf \
diff --git a/nextcloud_10-fpm/Dockerfile b/nextcloud_10-fpm/Dockerfile
index 1a365e6..7b68532 100644
--- a/nextcloud_10-fpm/Dockerfile
+++ b/nextcloud_10-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:5.6-fpm
+FROM php:7.1-fpm
 
 RUN apt-get update && apt-get install -y \
   bzip2 \
@@ -17,7 +17,7 @@ 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-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
+  && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
@@ -32,12 +32,12 @@ RUN { \
 
 # PECL extensions
 RUN set -ex \
- && pecl install APCu-4.0.10 \
- && pecl install memcached-2.2.0 \
- && pecl install redis-2.2.8 \
+ && pecl install APCu-5.1.8 \
+ && pecl install memcached-3.0.2 \
+ && pecl install redis-3.1.1 \
  && docker-php-ext-enable apcu redis memcached
 
-ENV NEXTCLOUD_VERSION 10.0.3
+ENV NEXTCLOUD_VERSION 10.0.4
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
diff --git a/nextcloud_10/Dockerfile b/nextcloud_10/Dockerfile
index 4356509..8112381 100644
--- a/nextcloud_10/Dockerfile
+++ b/nextcloud_10/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:5.6-apache
+FROM php:7.1-apache
 
 RUN apt-get update && apt-get install -y \
   bzip2 \
@@ -17,7 +17,7 @@ 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-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
+  && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
@@ -33,13 +33,13 @@ 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 \
+ && pecl install APCu-5.1.8 \
+ && pecl install memcached-3.0.2 \
+ && pecl install redis-3.1.1 \
  && docker-php-ext-enable apcu redis memcached
 RUN a2enmod rewrite
 
-ENV NEXTCLOUD_VERSION 10.0.3
+ENV NEXTCLOUD_VERSION 10.0.4
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
diff --git a/nextcloud_fpm/Dockerfile b/nextcloud_11-fpm/Dockerfile
similarity index 90%
rename from nextcloud_fpm/Dockerfile
rename to nextcloud_11-fpm/Dockerfile
index 35c1264..ea6f93a 100644
--- a/nextcloud_fpm/Dockerfile
+++ b/nextcloud_11-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:5.6-fpm
+FROM php:7.1-fpm
 
 RUN apt-get update && apt-get install -y \
   bzip2 \
@@ -17,7 +17,7 @@ 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-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
+  && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
@@ -32,12 +32,12 @@ RUN { \
 
 # PECL extensions
 RUN set -ex \
- && pecl install APCu-4.0.10 \
- && pecl install memcached-2.2.0 \
- && pecl install redis-2.2.8 \
+ && pecl install APCu-5.1.8 \
+ && pecl install memcached-3.0.2 \
+ && pecl install redis-3.1.1 \
  && docker-php-ext-enable apcu redis memcached
 
-ENV NEXTCLOUD_VERSION 11.0.1
+ENV NEXTCLOUD_VERSION 11.0.2
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
diff --git a/nextcloud_fpm/docker-entrypoint.sh b/nextcloud_11-fpm/docker-entrypoint.sh
similarity index 100%
rename from nextcloud_fpm/docker-entrypoint.sh
rename to nextcloud_11-fpm/docker-entrypoint.sh
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_11/Dockerfile
similarity index 90%
rename from nextcloud_latest/Dockerfile
rename to nextcloud_11/Dockerfile
index d645d8b..e801a80 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_11/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:5.6-apache
+FROM php:7.1-apache
 
 RUN apt-get update && apt-get install -y \
   bzip2 \
@@ -17,7 +17,7 @@ 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-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
+  && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
@@ -33,13 +33,13 @@ 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 \
+ && pecl install APCu-5.1.8 \
+ && pecl install memcached-3.0.2 \
+ && pecl install redis-3.1.1 \
  && docker-php-ext-enable apcu redis memcached
 RUN a2enmod rewrite
 
-ENV NEXTCLOUD_VERSION 11.0.1
+ENV NEXTCLOUD_VERSION 11.0.2
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
diff --git a/nextcloud_latest/docker-entrypoint.sh b/nextcloud_11/docker-entrypoint.sh
similarity index 100%
rename from nextcloud_latest/docker-entrypoint.sh
rename to nextcloud_11/docker-entrypoint.sh
diff --git a/nextcloud_9-fpm/Dockerfile b/nextcloud_9-fpm/Dockerfile
index 9d41eaf..5e5b7d2 100644
--- a/nextcloud_9-fpm/Dockerfile
+++ b/nextcloud_9-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:5.6-fpm
+FROM php:7.1-fpm
 
 RUN apt-get update && apt-get install -y \
   bzip2 \
@@ -17,7 +17,7 @@ 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-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
+  && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
@@ -32,12 +32,12 @@ RUN { \
 
 # PECL extensions
 RUN set -ex \
- && pecl install APCu-4.0.10 \
- && pecl install memcached-2.2.0 \
- && pecl install redis-2.2.8 \
+ && pecl install APCu-5.1.8 \
+ && pecl install memcached-3.0.2 \
+ && pecl install redis-3.1.1 \
  && docker-php-ext-enable apcu redis memcached
 
-ENV NEXTCLOUD_VERSION 9.0.56
+ENV NEXTCLOUD_VERSION 9.0.57
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \
diff --git a/nextcloud_9/Dockerfile b/nextcloud_9/Dockerfile
index 3fead99..a07baf2 100644
--- a/nextcloud_9/Dockerfile
+++ b/nextcloud_9/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:5.6-apache
+FROM php:7.1-apache
 
 RUN apt-get update && apt-get install -y \
   bzip2 \
@@ -17,7 +17,7 @@ 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-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
+  && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
@@ -33,13 +33,13 @@ 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 \
+ && pecl install APCu-5.1.8 \
+ && pecl install memcached-3.0.2 \
+ && pecl install redis-3.1.1 \
  && docker-php-ext-enable apcu redis memcached
 RUN a2enmod rewrite
 
-ENV NEXTCLOUD_VERSION 9.0.56
+ENV NEXTCLOUD_VERSION 9.0.57
 VOLUME /var/www/html
 
 RUN curl -fsSL -o nextcloud.tar.bz2 \

@tianon
Copy link
Member Author

tianon commented Mar 13, 2017

Build test of #2742; e30865b (cassandra, irssi, nextcloud):

$ bashbrew build cassandra:2.1.17
Using bashbrew/cache:e387f1d49398ae148ca5453724cb3cd6ab8f77723915f5074ef886ccfcd13b57 (cassandra:2.1.17)
Tagging cassandra:2.1.17
Tagging cassandra:2.1

$ test/run.sh cassandra:2.1.17
testing cassandra:2.1.17
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'cassandra-basics' [5/5].......passed


$ bashbrew build cassandra:2.2.9
Using bashbrew/cache:2451dfc8da17ae1d2d14665ea2c650c9cb74c1da735d84c138743197a5d6b754 (cassandra:2.2.9)
Tagging cassandra:2.2.9
Tagging cassandra:2.2
Tagging cassandra:2

$ test/run.sh cassandra:2.2.9
testing cassandra:2.2.9
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'cassandra-basics' [5/5].......passed


$ bashbrew build cassandra:3.0.12
Building bashbrew/cache:1415502f96a605d123b6564ce719b7a1a646ae26e761814e807cb8fc4677ce04 (cassandra:3.0.12)
Tagging cassandra:3.0.12
Tagging cassandra:3.0

$ test/run.sh cassandra:3.0.12
testing cassandra:3.0.12
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'cassandra-basics' [5/5]........passed


$ bashbrew build cassandra:3.10
Using bashbrew/cache:45031e5051109a90a06cae7520eba5bdb487c0fb66ad5515f40aedb37dd273e6 (cassandra:3.10)
Tagging cassandra:3.10
Tagging cassandra:3
Tagging cassandra:latest

$ test/run.sh cassandra:3.10
testing cassandra:3.10
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'cassandra-basics' [5/5]........passed
$ bashbrew build irssi:1.0.2
Building bashbrew/cache:a390ea2106aa0174ade5dbcfb32160aa1c16328e8adecdc6541317e8f9262da0 (irssi:1.0.2)
Tagging irssi:1.0.2
Tagging irssi:1.0
Tagging irssi:1
Tagging irssi:latest

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


$ bashbrew build irssi:1.0.2-alpine
Building bashbrew/cache:cf016ab6adb738a69c34184d0656c8d5564b9cd1cfec2e1fa6924ab9bec71ef5 (irssi:1.0.2-alpine)
Tagging irssi:1.0.2-alpine
Tagging irssi:1.0-alpine
Tagging irssi:1-alpine
Tagging irssi:alpine

$ test/run.sh irssi:1.0.2-alpine
testing irssi:1.0.2-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:10.0.4-apache
Building bashbrew/cache:220fdfe3206812d64dc72b118c3e3784682b14eca5437ddb5dd61c1e90bf295b (nextcloud:10.0.4-apache)
Tagging nextcloud:10.0.4-apache
Tagging nextcloud:10.0-apache
Tagging nextcloud:10-apache
Tagging nextcloud:10.0.4
Tagging nextcloud:10.0
Tagging nextcloud:10

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

$ test/run.sh nextcloud:10.0.4-fpm
testing nextcloud:10.0.4-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.2-apache
Building bashbrew/cache:0acf51a45d54974d048e8d7ae3726d0f54a6274965672646ba152714bad7648c (nextcloud:11.0.2-apache)
Tagging nextcloud:11.0.2-apache
Tagging nextcloud:11.0-apache
Tagging nextcloud:11-apache
Tagging nextcloud:11.0.2
Tagging nextcloud:11.0
Tagging nextcloud:11

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

$ test/run.sh nextcloud:11.0.2-fpm
testing nextcloud:11.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:9.0.57-apache
Building bashbrew/cache:4d562f54d656afc912a977d4c25cf2fa2d8a90ca9401159fcb95bcdddd519c5b (nextcloud:9.0.57-apache)
Tagging nextcloud:9.0.57-apache
Tagging nextcloud:9.0-apache
Tagging nextcloud:9-apache
Tagging nextcloud:9.0.57
Tagging nextcloud:9.0
Tagging nextcloud:9

$ test/run.sh nextcloud:9.0.57-apache
testing nextcloud:9.0.57-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.57-fpm
Building bashbrew/cache:40b10748d5773c45ce9f07c6e8021f0a337723056444e9274f1ebcbffa9b4140 (nextcloud:9.0.57-fpm)
Tagging nextcloud:9.0.57-fpm
Tagging nextcloud:9.0-fpm
Tagging nextcloud:9-fpm

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

@yosifkit yosifkit merged commit cf35633 into docker-library:master Mar 13, 2017
@yosifkit yosifkit deleted the update-docker-library branch March 13, 2017 18:20
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