REL-0.12 Update new versions of available Docker container

2025-02-20 17:33:05 +00:00 · 2017-10-08 12:17:36 +02:00 · 2017-10-08 12:17:36 +02:00 · bb2288a461
commit bb2288a461
parent f454a032c9
5 changed files with 60 additions and 94 deletions
--- a/.devilbox/www/config.php
+++ b/.devilbox/www/config.php
@ -14,7 +14,7 @@ putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');


 $DEVILBOX_VERSION = 'v0.12';
-$DEVILBOX_DATE = '2017-10-03';
+$DEVILBOX_DATE = '2017-10-08';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';

 //
--- a/.travis.yml
+++ b/.travis.yml
@ -200,15 +200,23 @@ env:
  - S1=PHP V1=php-fpm-7.1 S2=PGSQL V2=9.6
  - S1=PHP V1=php-fpm-7.2 S2=PGSQL V2=9.6
  - S1=PHP V1=hhvm-latest S2=PGSQL V2=9.6
+  # PHP vs PgSQL 10.0
+  - S1=PHP V1=php-fpm-5.4 S2=PGSQL V2=10.0
+  - S1=PHP V1=php-fpm-5.5 S2=PGSQL V2=10.0
+  - S1=PHP V1=php-fpm-5.6 S2=PGSQL V2=10.0
+  - S1=PHP V1=php-fpm-7.0 S2=PGSQL V2=10.0
+  - S1=PHP V1=php-fpm-7.1 S2=PGSQL V2=10.0
+  - S1=PHP V1=php-fpm-7.2 S2=PGSQL V2=10.0
+  - S1=PHP V1=hhvm-latest S2=PGSQL V2=10.0


 ###
 ### Build Matrix definition
 ###
-matrix:
-  allow_failures:
-    - env: S1=PHP V1=hhvm-latest S2=HTTPD V2=apache-2.2
-
+#matrix:
+#  allow_failures:
+#    - env: S1=PHP V1=hhvm-latest S2=HTTPD V2=apache-2.2
+#

 ###
 ### Berfore Install
--- a/README.md
+++ b/README.md
@ -77,8 +77,8 @@ Every single attachable container comes with many different versions. In order t
  </thead>
  <tbody>
    <tr>
-      <td><a target="_blank" title="Apache 2.2"       href="https://github.com/cytopia/docker-apache-2.2">2.2</a></td>
-      <td><a target="_blank" title="Nginx stable"     href="https://github.com/cytopia/docker-nginx-stable">stable</a></td>
+      <td><a target="_blank" title="Apache 2.2"       href="https://github.com/devilbox/docker-apache-2.2">2.2</a></td>
+      <td><a target="_blank" title="Nginx stable"     href="https://github.com/devilbox/docker-nginx-stable">stable</a></td>
      <td><a target="_blank" title="PHP 5.4"          href="https://github.com/cytopia/docker-php-fpm-5.4">5.4</a></td>
      <td><a target="_blank" title="MySQL 5.5"        href="https://github.com/cytopia/docker-mysql-5.5">5.5</a></td>
      <td><a target="_blank" title="MariaDB 5.5"      href="https://github.com/cytopia/docker-mariadb-5.5">5.5</a></td>
@ -89,8 +89,8 @@ Every single attachable container comes with many different versions. In order t
      <td><a target="_blank" title="MongoDB 2.8"      href="https://github.com/docker-library/mongo">2.8</a></td>
    </tr>
    <tr>
-      <td><a target="_blank" title="Apache 2.4"       href="https://github.com/cytopia/docker-apache-2.4">2.4</a></td>
-      <td><a target="_blank" title="Nginx mainline"   href="https://github.com/cytopia/docker-nginx-mainline">mainline</a></td>
+      <td><a target="_blank" title="Apache 2.4"       href="https://github.com/devilbox/docker-apache-2.4">2.4</a></td>
+      <td><a target="_blank" title="Nginx mainline"   href="https://github.com/devilbox/docker-nginx-mainline">mainline</a></td>
      <td><a target="_blank" title="PHP 5.5"          href="https://github.com/cytopia/docker-php-fpm-5.5">5.5</a></td>
      <td><a target="_blank" title="MySQL 5.6"        href="https://github.com/cytopia/docker-mysql-5.6">5.6</a></td>
      <td><a target="_blank" title="MariaDB 10.0"     href="https://github.com/cytopia/docker-mariadb-10.0">10.0</a></td>
@ -120,7 +120,7 @@ Every single attachable container comes with many different versions. In order t
      <td><a target="_blank" title="MariaDB 10.2"     href="https://github.com/cytopia/docker-mariadb-10.2">10.2</a></td>
      <td></td>
      <td><a target="_blank" title="PgSQL 9.4"        href="https://github.com/docker-library/postgres">9.4</a></td>
-      <td></td>
+      <td><a target="_blank" title="Redis 4.0"        href="https://github.com/docker-library/redis">4.0</a></td>
      <td><a target="_blank" title="Memcached 1.4.23" href="https://github.com/docker-library/memcached">1.4.24</a></td>
      <td><a target="_blank" title="MongoDB 3.4"      href="https://github.com/docker-library/mongo">3.4</a></td>
    </tr>
@ -145,7 +145,7 @@ Every single attachable container comes with many different versions. In order t
      <td></td>
      <td><a target="_blank" title="PgSQL 9.6"        href="https://github.com/docker-library/postgres">9.6</a></td>
      <td></td>
-      <td><a target="_blank" title="Memcached latest" href="https://github.com/docker-library/memcached">1.4.36</a></td>
+      <td><a target="_blank" title="Memcached 1.5.2"  href="https://github.com/docker-library/memcached">1.5.2</a></td>
      <td></td>
    </tr>
    <tr>
@ -155,7 +155,7 @@ Every single attachable container comes with many different versions. In order t
      <td></td>
      <td></td>
      <td></td>
-      <td></td>
+      <td><a target="_blank" title="PgSQL 10.0"       href="https://github.com/docker-library/postgres">10.0</a></td>
      <td></td>
      <td><a target="_blank" title="Memcached latest" href="https://github.com/docker-library/memcached">latest</a></td>
      <td></td>
@ -386,10 +386,10 @@ In order to make sure every combination works with each other, the devilbox inte

 | DNS | Webserver | PHP |
 |-----|-----------|-----|
-| [![Build Status](https://travis-ci.org/cytopia/docker-bind.svg?branch=master)](https://travis-ci.org/cytopia/docker-bind) [Bind](https://github.com/cytopia/docker-bind)  | [![Build Status](https://travis-ci.org/cytopia/docker-apache-2.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-apache-2.2) [Apache 2.2](https://github.com/cytopia/docker-apache-2.2) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.4.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.4) [PHP 5.4](https://github.com/cytopia/docker-php-fpm-5.4) |
-|     | [![Build Status](https://travis-ci.org/cytopia/docker-apache-2.4.svg?branch=master)](https://travis-ci.org/cytopia/docker-apache-2.4) [Apache 2.4](https://github.com/cytopia/docker-apache-2.4) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.5) [PHP 5.5](https://github.com/cytopia/docker-php-fpm-5.5) |
-|     | [![Build Status](https://travis-ci.org/cytopia/docker-nginx-stable.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-stable) [Nginx stable](https://github.com/cytopia/docker-nginx-stable) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.6) [PHP 5.6](https://github.com/cytopia/docker-php-fpm-5.6) |
-|     | [![Build Status](https://travis-ci.org/cytopia/docker-nginx-mainline.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-mainline) [Nginx mainline](https://github.com/cytopia/docker-nginx-mainline) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.0) [PHP 7.0](https://github.com/cytopia/docker-php-fpm-7.0) |
+| [![Build Status](https://travis-ci.org/cytopia/docker-bind.svg?branch=master)](https://travis-ci.org/cytopia/docker-bind) [Bind](https://github.com/cytopia/docker-bind)  | [![Build Status](https://travis-ci.org/devilbox/docker-apache-2.2.svg?branch=master)](https://travis-ci.org/devilbox/docker-apache-2.2) [Apache 2.2](https://github.com/devilbox/docker-apache-2.2) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.4.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.4) [PHP 5.4](https://github.com/cytopia/docker-php-fpm-5.4) |
+|     | [![Build Status](https://travis-ci.org/devilbox/docker-apache-2.4.svg?branch=master)](https://travis-ci.org/devilbox/docker-apache-2.4) [Apache 2.4](https://github.com/devilbox/docker-apache-2.4) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.5) [PHP 5.5](https://github.com/cytopia/docker-php-fpm-5.5) |
+|     | [![Build Status](https://travis-ci.org/devilbox/docker-nginx-stable.svg?branch=master)](https://travis-ci.org/devilbox/docker-nginx-stable) [Nginx stable](https://github.com/devilbox/docker-nginx-stable) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.6) [PHP 5.6](https://github.com/cytopia/docker-php-fpm-5.6) |
+|     | [![Build Status](https://travis-ci.org/devilbox/docker-nginx-mainline.svg?branch=master)](https://travis-ci.org/devilbox/docker-nginx-mainline) [Nginx mainline](https://github.com/devilbox/docker-nginx-mainline) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.0) [PHP 7.0](https://github.com/cytopia/docker-php-fpm-7.0) |
 |     | | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.1) [PHP 7.1](https://github.com/cytopia/docker-php-fpm-7.1) |
 |     | | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.2) [PHP 7.2](https://github.com/cytopia/docker-php-fpm-7.2)
 |     | | [![Build Status](https://travis-ci.org/cytopia/docker-hhvm-latest.svg?branch=master)](https://travis-ci.org/cytopia/docker-hhvm-latest) [HHVM latest](https://github.com/cytopia/docker-hhvm-latest)
@ -404,7 +404,7 @@ In order to make sure every combination works with each other, the devilbox inte
 | [![Build Status](https://travis-ci.org/cytopia/docker-mysql-8.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-8.0) [MySQL 8.0](https://github.com/cytopia/docker-mysql-8.0)  | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.4](https://hub.docker.com/_/postgres/) | |
 | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-5.5) [MariaDB 5.5](https://github.com/cytopia/docker-mariadb-5.5) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.5](https://hub.docker.com/_/postgres/) | |
 | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.0) [MariaDB 10.0](https://github.com/cytopia/docker-mariadb-10.0) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.6](https://hub.docker.com/_/postgres/) | |
-| [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.1) [MariaDB 10.1](https://github.com/cytopia/docker-mariadb-10.1) | | |
+| [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.1) [MariaDB 10.1](https://github.com/cytopia/docker-mariadb-10.1) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 10.0](https://hub.docker.com/_/postgres/) | |
 | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.2) [MariaDB 10.2](https://github.com/cytopia/docker-mariadb-10.2) | | |
 | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.3.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.3) [MariaDB 10.3](https://github.com/cytopia/docker-mariadb-10.3) | | |
 | [![Build Status](https://travis-ci.org/cytopia/docker-percona-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-percona-5.5) [PerconaDB 5.5](https://github.com/cytopia/docker-percona-5.5) | | |
@ -418,7 +418,7 @@ In order to make sure every combination works with each other, the devilbox inte
 | Cassandra 2.1 | CouchDB 1.6 | [![Travis CI](https://travis-ci.org/docker-library/memcached.svg?branch=master)](https://travis-ci.org/docker-library/memcached) [latest](https://github.com/docker-library/memcached) | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [2.8](https://github.com/docker-library/mongo) | [![Travis CI](https://travis-ci.org/docker-library/redis.svg?branch=master)](https://travis-ci.org/docker-library/redis) [2.8](https://github.com/docker-library/redis) |
 | Cassandra 2.2 | CouchDB 2.0 |                  | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [3.0](https://github.com/docker-library/mongo) | [![Travis CI](https://travis-ci.org/docker-library/redis.svg?branch=master)](https://travis-ci.org/docker-library/redis) [3.0](https://github.com/docker-library/redis) |
 | Cassandra 3.0 |             |                  | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [3.2](https://github.com/docker-library/mongo) | [![Travis CI](https://travis-ci.org/docker-library/redis.svg?branch=master)](https://travis-ci.org/docker-library/redis) [3.2](https://github.com/docker-library/redis) |
-|               |             |                  | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [3.4](https://github.com/docker-library/mongo) | |
+|               |             |                  | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [3.4](https://github.com/docker-library/mongo) | [![Travis CI](https://travis-ci.org/docker-library/redis.svg?branch=master)](https://travis-ci.org/docker-library/redis) [4.0](https://github.com/docker-library/redis) |
 | | | | [![build Status](https://travis-ci.org/docker-library/mongo.svg?branch=master)](https://travis-ci.org/docker-library/mongo) [3.5](https://github.com/docker-library/mongo) | |

 <!--
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -27,12 +27,11 @@ version: '2.1'
 ################################################################################
 services:

-  # ----------------------------------------
+  # ------------------------------------------------------------
  # Bind (DNS Server)
-  # ----------------------------------------
+  # ------------------------------------------------------------
  bind:
    image: cytopia/bind:latest
-    #image: cytopia/bind:0.10
    restart: always
    ports:
      # [local-machine:]local-port:docker-port
@ -60,25 +59,23 @@ services:
        ipv4_address: 172.16.238.100


-  # ----------------------------------------
-  # PHP-FPM
-  # ----------------------------------------
+  # ------------------------------------------------------------
+  # PHP / HHVM
+  # ------------------------------------------------------------
  php:
    image: cytopia/${PHP_SERVER:-php-fpm-7.0}:latest
-    #image: cytopia/${PHP_SERVER:-php-fpm-7.0}:0.11
    restart: always

    ##
-    ## Custom variables
+    ## All .env variables
    ##
    ## Source all variables defined in .env
-    ## This makes any custom variable available in each PHP/HHVM container
+    ## This also makes any custom variable available in each PHP/HHVM container
    ##
    env_file:
      - ./.env

    environment:
-
      ##
      ## Debug?
      ##
@ -95,18 +92,6 @@ services:
      ##
      - TIMEZONE

-      ##
-      ## TLD SUffix
-      ##
-      - TLD_SUFFIX=${TLD_SUFFIX:-loc}
-      - DNS_CHECK_TIMEOUT=${DNS_CHECK_TIMEOUT:-1}
-
-      ##
-      ## Password protect the devilbox Intranet
-      ##
-      - DEVILBOX_UI_PROTECT=${DEVILBOX_UI_PROTECT:-0}
-      - DEVILBOX_UI_PASSWORD=${DEVILBOX_UI_PASSWORD}
-
      ##
      ## PHP Xdebug
      ##
@ -131,36 +116,6 @@ services:
      - MYSQL_BACKUP_PASS=${MYSQL_ROOT_PASSWORD}
      - MYSQL_BACKUP_HOST=mysql

-      ##
-      ## Additional variables to announce to intranet/php-container
-      ##
-      # Ports
-      - LOCAL_LISTEN_ADDR
-      - HOST_PORT_BIND
-      - HOST_PORT_HTTPD
-      - HOST_PORT_MYSQL
-      - HOST_PORT_PGSQL
-      - HOST_PORT_REDIS
-      - HOST_PORT_MEMCD
-      - HOST_PORT_MONGO
-      # Data dir paths
-      - HOST_PATH_HTTPD_DATADIR
-      - HOST_PATH_MYSQL_DATADIR
-      - HOST_PATH_PGSQL_DATADIR
-      - HOST_PATH_MONGO_DATADIR
-      # Database credentials
-      - PGSQL_ROOT_USER
-      - PGSQL_ROOT_PASSWORD
-      - MYSQL_ROOT_PASSWORD
-      # Selected Server versions
-      - PHP_SERVER
-      - HTTPD_SERVER
-      - PGSQL_SERVER
-      - MYSQL_SERVER
-      - REDIS_SERVER
-      - MEMCD_SERVER
-      - MONGO_SERVER
-
    networks:
      app_net:
        ipv4_address: 172.16.238.10
@ -203,9 +158,10 @@ services:
    depends_on:
      - bind

-  # ----------------------------------------
-  # HTTPD
-  # ----------------------------------------
+
+  # ------------------------------------------------------------
+  # Web Server
+  # ------------------------------------------------------------
  httpd:
    image: devilbox/${HTTPD_SERVER:-nginx-stable}:0.12
    restart: always
@ -281,12 +237,11 @@ services:
      - php


-  # ----------------------------------------
-  # DATABASE
-  # ----------------------------------------
+  # ------------------------------------------------------------
+  # MySQL Database
+  # ------------------------------------------------------------
  mysql:
    image: cytopia/${MYSQL_SERVER:-mariadb-10.1}:latest
-    #image: cytopia/${MYSQL_SERVER:-mariadb-10.1}:0.9

    environment:

@ -346,17 +301,12 @@ services:
      - httpd


-  # ----------------------------------------
-  # POSTGRESQL
-  # ----------------------------------------
+  # ------------------------------------------------------------
+  # PostgreSQL
+  # ------------------------------------------------------------
  pgsql:
    image: postgres:${PGSQL_SERVER:-9.6}

-    # Manually build via `docker-compose build`
-    #build:
-        #context: https://github.com/cytopia/docker-${MYSQL_SERVER}.git#1
-    #    context: https://github.com/cytopia/docker-${MYSQL_SERVER}.git
-
    environment:

      - POSTGRES_USER=${PGSQL_ROOT_USER}
@ -387,9 +337,9 @@ services:
      - httpd


-  # ----------------------------------------
+  # ------------------------------------------------------------
  # Redis
-  # ----------------------------------------
+  # ------------------------------------------------------------
  redis:
    image: redis:${REDIS_SERVER:-3.2}

@ -414,9 +364,9 @@ services:
      - httpd


-  # ----------------------------------------
+  # ------------------------------------------------------------
  # Memcached
-  # ----------------------------------------
+  # ------------------------------------------------------------
  memcd:
    image: memcached:${MEMCD_SERVER:-latest}

@ -441,9 +391,9 @@ services:
      - httpd


-  # ----------------------------------------
-  # Mongo
-  # ----------------------------------------
+  # ------------------------------------------------------------
+  # MongoDB
+  # ------------------------------------------------------------
  mongo:
    image: mongo:${MONGO_SERVER:-latest}

--- a/12
+++ b/12
@ -212,6 +212,7 @@ MYSQL_SERVER=mariadb-10.1
 #PGSQL_SERVER=9.4
 #PGSQL_SERVER=9.5
 PGSQL_SERVER=9.6
+#PGSQL_SERVER=10.0


 ###
@ -219,13 +220,14 @@ PGSQL_SERVER=9.6
 ###
 #REDIS_SERVER=2.8
 #REDIS_SERVER=3.0
-REDIS_SERVER=3.2
+#REDIS_SERVER=3.2
+REDIS_SERVER=4.0


 ###
 ### 1.6 Choose Memcached Server Image
 ###
-MEMCD_SERVER=1.4.21
+#MEMCD_SERVER=1.4.21
 #MEMCD_SERVER=1.4.22
 #MEMCD_SERVER=1.4.23
 #MEMCD_SERVER=1.4.24
@ -241,6 +243,12 @@ MEMCD_SERVER=1.4.21
 #MEMCD_SERVER=1.4.34
 #MEMCD_SERVER=1.4.35
 #MEMCD_SERVER=1.4.36
+#MEMCD_SERVER=1.4.37
+#MEMCD_SERVER=1.4.38
+#MEMCD_SERVER=1.4.39
+#MEMCD_SERVER=1.5.0
+#MEMCD_SERVER=1.5.1
+MEMCD_SERVER=1.5.2
 #MEMCD_SERVER=latest