Skip to content

Commit

Permalink
Update container versions
Browse files Browse the repository at this point in the history
  • Loading branch information
cytopia committed Nov 2, 2018
1 parent 619c0aa commit 8fddde3
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 69 deletions.
46 changes: 23 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,10 @@ Every single attachable container comes with many different versions. In order t
<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>
<td><a target="_blank" title="PerconaDB 5.5" href="https://github.com/cytopia/docker-percona-5.5">5.5</a></td>
<td><a target="_blank" title="PgSQL 9.1" href="https://github.com/docker-library/postgres">9.1</a></td>
<td><a target="_blank" title="PgSQL 9.0" href="https://github.com/docker-library/postgres">9.0</a></td>
<td><a target="_blank" title="Redis 2.8" href="https://github.com/docker-library/redis">2.8</a></td>
<td><a target="_blank" title="Memcached 1.4.21" href="https://github.com/docker-library/memcached">1.4.21</a></td>
<td><a target="_blank" title="MongoDB 2.8" href="https://github.com/docker-library/mongo">2.8</a></td>
<td><a target="_blank" title="Memcached 1.4" href="https://github.com/docker-library/memcached">1.4</a></td>
<td><a target="_blank" title="MongoDB 2.2" href="https://github.com/docker-library/mongo">2.2</a></td>
</tr>
<tr>
<td><a target="_blank" title="Apache 2.4" href="https://github.com/devilbox/docker-apache-2.4">2.4</a></td>
Expand All @@ -195,10 +195,10 @@ Every single attachable container comes with many different versions. In order t
<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>
<td><a target="_blank" title="PerconaDB 5.6" href="https://github.com/cytopia/docker-percona-5.6">5.6</a></td>
<td><a target="_blank" title="PgSQL 9.2" href="https://github.com/docker-library/postgres">9.2</a></td>
<td><a target="_blank" title="PgSQL 9.1" href="https://github.com/docker-library/postgres">9.1</a></td>
<td><a target="_blank" title="Redis 3.0" href="https://github.com/docker-library/redis">3.0</a></td>
<td><a target="_blank" title="Memcached 1.4.22" href="https://github.com/docker-library/memcached">1.4.22</a></td>
<td><a target="_blank" title="MongoDB 3.0" href="https://github.com/docker-library/mongo">3.0</a></td>
<td><a target="_blank" title="Memcached 1.5" href="https://github.com/docker-library/memcached">1.5</a></td>
<td><a target="_blank" title="MongoDB 2.4" href="https://github.com/docker-library/mongo">2.4</a></td>
</tr>
<tr>
<td></td>
Expand All @@ -207,10 +207,10 @@ Every single attachable container comes with many different versions. In order t
<td><a target="_blank" title="MySQL 5.7" href="https://github.com/cytopia/docker-mysql-5.7">5.7</a></td>
<td><a target="_blank" title="MariaDB 10.1" href="https://github.com/cytopia/docker-mariadb-10.1">10.1</a></td>
<td><a target="_blank" title="PerconaDB 5.7" href="https://github.com/cytopia/docker-percona-5.7">5.7</a></td>
<td><a target="_blank" title="PgSQL 9.3" href="https://github.com/docker-library/postgres">9.3</a></td>
<td><a target="_blank" title="PgSQL 9.2" href="https://github.com/docker-library/postgres">9.2</a></td>
<td><a target="_blank" title="Redis 3.2" href="https://github.com/docker-library/redis">3.2</a></td>
<td><a target="_blank" title="Memcached 1.4.23" href="https://github.com/docker-library/memcached">1.4.23</a></td>
<td><a target="_blank" title="MongoDB 3.2" href="https://github.com/docker-library/mongo">3.2</a></td>
<td><a target="_blank" title="Memcached latest" href="https://github.com/docker-library/memcached">latest</a></td>
<td><a target="_blank" title="MongoDB 2.6" href="https://github.com/docker-library/mongo">2.6</a></td>
</tr>
<tr>
<td></td>
Expand All @@ -219,10 +219,10 @@ Every single attachable container comes with many different versions. In order t
<td><a target="_blank" title="MySQL 8.0" href="https://github.com/cytopia/docker-mysql-8.0">8.0</a></td>
<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><a target="_blank" title="PgSQL 9.3" href="https://github.com/docker-library/postgres">9.3</a></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>
<td></td>
<td><a target="_blank" title="MongoDB 2.8" href="https://github.com/docker-library/mongo">2.8</a></td>
</tr>
<tr>
<td></td>
Expand All @@ -231,10 +231,10 @@ Every single attachable container comes with many different versions. In order t
<td></td>
<td><a target="_blank" title="MariaDB 10.3" href="https://github.com/cytopia/docker-mariadb-10.3">10.3</a></td>
<td></td>
<td><a target="_blank" title="PgSQL 9.5" href="https://github.com/docker-library/postgres">9.5</a></td>
<td><a target="_blank" title="PgSQL 9.4" href="https://github.com/docker-library/postgres">9.4</a></td>
<td><a target="_blank" title="Redis latest" href="https://github.com/docker-library/redis">latest</a></td>
<td></td>
<td>...</td>
<td><a target="_blank" title="MongoDB 3.5" href="https://github.com/docker-library/mongo">3.5</a></td>
<td><a target="_blank" title="MongoDB 3.0" href="https://github.com/docker-library/mongo">3.0</a></td>
</tr>
<tr>
<td></td>
Expand All @@ -243,10 +243,10 @@ Every single attachable container comes with many different versions. In order t
<td></td>
<td></td>
<td></td>
<td><a target="_blank" title="PgSQL 9.6" href="https://github.com/docker-library/postgres">9.6</a></td>
<td><a target="_blank" title="PgSQL 9.5" href="https://github.com/docker-library/postgres">9.5</a></td>
<td></td>
<td><a target="_blank" title="Memcached 1.5.2" href="https://github.com/docker-library/memcached">1.5.2</a></td>
<td></td>
<td><a target="_blank" title="MongoDB 3.2" href="https://github.com/docker-library/mongo">3.2</a></td>
</tr>
<tr>
<td></td>
Expand All @@ -255,10 +255,10 @@ Every single attachable container comes with many different versions. In order t
<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></td>
<td><a target="_blank" title="Memcached latest" href="https://github.com/docker-library/memcached">latest</a></td>
<td></td>
<td>...</td>
</tr>
<tr>
<td></td>
Expand All @@ -267,10 +267,10 @@ Every single attachable container comes with many different versions. In order t
<td></td>
<td></td>
<td></td>
<td><a target="_blank" title="PgSQL 10.5" href="https://github.com/docker-library/postgres">10.5</a></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a target="_blank" title="MongoDB 4.0" href="https://github.com/docker-library/mongo">4.0</a></td>
</tr>
<tr>
<td></td>
Expand All @@ -279,10 +279,10 @@ Every single attachable container comes with many different versions. In order t
<td></td>
<td></td>
<td></td>
<td><a target="_blank" title="PgSQL latest" href="https://github.com/docker-library/postgres">latest</a></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a target="_blank" title="MongoDB latest" href="https://github.com/docker-library/mongo">latest</a></td>
</tr>
</tbody>
</table>
Expand Down
28 changes: 15 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ services:
# MySQL Database
# ------------------------------------------------------------
mysql:
image: cytopia/${MYSQL_SERVER:-mariadb-10.1}:latest
image: cytopia/${MYSQL_SERVER:-mariadb-10.3}:latest
hostname: mysql

environment:
Expand Down Expand Up @@ -342,17 +342,17 @@ services:
# HOST-DIRECTORY : DOCKER-DIRECTORY

# Mount logs
- ${DEVILBOX_PATH}/log/${MYSQL_SERVER:-mariadb-10.1}:/var/log/mysql:rw${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/log/${MYSQL_SERVER:-mariadb-10.3}:/var/log/mysql:rw${MOUNT_OPTIONS}

# Mount devilbox default overwrites
- ${DEVILBOX_PATH}/.devilbox/etc/${MYSQL_SERVER:-mariadb-10.1}:/etc/mysql/conf.d:ro${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/.devilbox/etc/${MYSQL_SERVER:-mariadb-10.3}:/etc/mysql/conf.d:ro${MOUNT_OPTIONS}

# Mount devilbox user-defined cnf files in order
# to overwrite the MySQL server configuration
- ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER:-mariadb-10.1}:/etc/mysql/docker-default.d:ro${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER:-mariadb-10.3}:/etc/mysql/docker-default.d:ro${MOUNT_OPTIONS}

# Mount MySQL Data directory
- devilbox-${MYSQL_SERVER:-mariadb-10.1}:/var/lib/mysql:rw${MOUNT_OPTIONS}
- devilbox-${MYSQL_SERVER:-mariadb-10.3}:/var/lib/mysql:rw${MOUNT_OPTIONS}

depends_on:
- bind
Expand All @@ -364,7 +364,7 @@ services:
# PostgreSQL
# ------------------------------------------------------------
pgsql:
image: postgres:${PGSQL_SERVER:-9.6}
image: postgres:${PGSQL_SERVER:-latest}
hostname: pgsql

environment:
Expand All @@ -386,10 +386,10 @@ services:
# HOST-DIRECTORY : DOCKER-DIRECTORY

# Mount logs
- ${DEVILBOX_PATH}/log/pgsql-${PGSQL_SERVER:-9.6}:/var/log/postgresql:rw${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/log/pgsql-${PGSQL_SERVER:-latest}:/var/log/postgresql:rw${MOUNT_OPTIONS}

# Mount PostgreSQL Data directory
- devilbox-pgsql-${PGSQL_SERVER:-9.6}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}
- devilbox-pgsql-${PGSQL_SERVER:-latest}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}

depends_on:
- bind
Expand All @@ -401,7 +401,7 @@ services:
# Redis
# ------------------------------------------------------------
redis:
image: redis:${REDIS_SERVER:-3.2}
image: redis:${REDIS_SERVER:-latest}
hostname: redis

# Apply custom arguments to redis startup
Expand All @@ -422,7 +422,7 @@ services:
# HOST-DIRECTORY : DOCKER-DIRECTORY

# Mount logs
- ${DEVILBOX_PATH}/log/redis-${REDIS_SERVER}:/var/log/redis:rw${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/log/redis-${REDIS_SERVER:-latest}:/var/log/redis:rw${MOUNT_OPTIONS}

depends_on:
- bind
Expand Down Expand Up @@ -524,6 +524,7 @@ volumes:
# ------------------------------------------------------------
# Postgres
# ------------------------------------------------------------
devilbox-pgsql-9.0:
devilbox-pgsql-9.1:
devilbox-pgsql-9.2:
devilbox-pgsql-9.3:
Expand All @@ -536,17 +537,18 @@ volumes:
devilbox-pgsql-10.3:
devilbox-pgsql-10.4:
devilbox-pgsql-10.5:
devilbox-pgsql-latest:

# ------------------------------------------------------------
# MongoDB
# ------------------------------------------------------------
devilbox-mongo-2.2:
devilbox-mongo-2.4:
devilbox-mongo-2.6:
devilbox-mongo-2.8:
devilbox-mongo-3.0:
devilbox-mongo-3.2:
devilbox-mongo-3.4:
devilbox-mongo-3.5:
devilbox-mongo-3.6:
devilbox-mongo-3.7:
devilbox-mongo-4.0:
devilbox-mongo-4.1:
devilbox-mongo-latest:
50 changes: 17 additions & 33 deletions env-example
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,9 @@ HTTPD_SERVER=nginx-stable
#MYSQL_SERVER=mysql-8.0
#MYSQL_SERVER=mariadb-5.5
#MYSQL_SERVER=mariadb-10.0
MYSQL_SERVER=mariadb-10.1
#MYSQL_SERVER=mariadb-10.1
#MYSQL_SERVER=mariadb-10.2
#MYSQL_SERVER=mariadb-10.3
MYSQL_SERVER=mariadb-10.3
#MYSQL_SERVER=percona-5.5
#MYSQL_SERVER=percona-5.6
#MYSQL_SERVER=percona-5.7
Expand All @@ -263,16 +263,20 @@ MYSQL_SERVER=mariadb-10.1
###
### 1.4 Choose PostgreSQL Server Image
###
#PGSQL_SERVER=9.0
#PGSQL_SERVER=9.1
#PGSQL_SERVER=9.2
#PGSQL_SERVER=9.3
#PGSQL_SERVER=9.4
#PGSQL_SERVER=9.5
PGSQL_SERVER=9.6
#PGSQL_SERVER=9.6
#PGSQL_SERVER=10.0
#PGSQL_SERVER=10.1
#PGSQL_SERVER=10.2
#PGSQL_SERVER=10.3
#PGSQL_SERVER=10.4
#PGSQL_SERVER=10.5
PGSQL_SERVER=latest


###
Expand All @@ -281,51 +285,31 @@ PGSQL_SERVER=9.6
#REDIS_SERVER=2.8
#REDIS_SERVER=3.0
#REDIS_SERVER=3.2
REDIS_SERVER=4.0
#REDIS_SERVER=5.0-rc
#REDIS_SERVER=4.0
REDIS_SERVER=latest


###
### 1.6 Choose Memcached Server Image
###
#MEMCD_SERVER=1.4.21
#MEMCD_SERVER=1.4.22
#MEMCD_SERVER=1.4.23
#MEMCD_SERVER=1.4.24
#MEMCD_SERVER=1.4.25
#MEMCD_SERVER=1.4.26
#MEMCD_SERVER=1.4.27
#MEMCD_SERVER=1.4.28
#MEMCD_SERVER=1.4.29
#MEMCD_SERVER=1.4.30
#MEMCD_SERVER=1.4.31
#MEMCD_SERVER=1.4.32
#MEMCD_SERVER=1.4.33
#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=1.5.3
#MEMCD_SERVER=1.5.4
MEMCD_SERVER=1.5.5
#MEMCD_SERVER=latest
#MEMCD_SERVER=1.4
#MEMCD_SERVER=1.5
MEMCD_SERVER=latest


###
### 1.7 Choose Mongo Server Image
###
#MONGO_SERVER=2.2
#MONGO_SERVER=2.4
#MONGO_SERVER=2.6
#MONGO_SERVER=2.8
#MONGO_SERVER=3.0
#MONGO_SERVER=3.2
#MONGO_SERVER=3.4
#MONGO_SERVER=3.5
#MONGO_SERVER=3.6
MONGO_SERVER=3.7
#MONGO_SERVER=4.0
MONGO_SERVER=latest



Expand Down

0 comments on commit 8fddde3

Please sign in to comment.