From 04c82c11c5833986ea7d64dc084be08865788747 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 21 Apr 2017 22:25:02 +0200 Subject: [PATCH 1/3] DVL-006 Adding MySQL 8.0 --- .travis.yml | 1 + README.md | 7 ++++--- env-example | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ae9f93c..cbcbe3d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ env: - SERVER=mysql VERSION=mysql-5.5 - SERVER=mysql VERSION=mysql-5.6 - SERVER=mysql VERSION=mysql-5.7 + - SERVER=mysql VERSION=mysql-8.0 - SERVER=mysql VERSION=mariadb-5.5 - SERVER=mysql VERSION=mariadb-10.0 - SERVER=mysql VERSION=mariadb-10.1 diff --git a/README.md b/README.md index 00bb0f6b..045f25ad 100644 --- a/README.md +++ b/README.md @@ -82,9 +82,10 @@ No need to install and configure different versions locally. Simply choose your | [![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-mysql-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.5) [MySQL 5.5](https://github.com/cytopia/docker-mysql-5.5) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.2](https://hub.docker.com/_/postgres/) | [![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-mysql-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.6) [MySQL 5.6](https://github.com/cytopia/docker-mysql-5.6) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.3](https://hub.docker.com/_/postgres/) | [![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-mysql-5.7.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.7) [MySQL 5.7](https://github.com/cytopia/docker-mysql-5.7) | [![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-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-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-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-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-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-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-hhvm-latest.svg?branch=master)](https://travis-ci.org/cytopia/docker-hhvm-latest) [HHVM latest](https://github.com/cytopia/docker-hhvm-latest) +| [![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-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.5](https://hub.docker.com/_/postgres/) | [![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-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.6](https://hub.docker.com/_/postgres/) | [![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-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/cytopia/docker-hhvm-latest.svg?branch=master)](https://travis-ci.org/cytopia/docker-hhvm-latest) [HHVM latest](https://github.com/cytopia/docker-hhvm-latest) +| | [![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.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.2) [MariaDB 10.2](https://github.com/cytopia/docker-mariadb-10.2) | | **Incompatible choices:**
diff --git a/env-example b/env-example index 39854bde..a5ddca28 100644 --- a/env-example +++ b/env-example @@ -73,6 +73,7 @@ HTTPD_SERVER=nginx-stable #MYSQL_SERVER=mysql-5.5 #MYSQL_SERVER=mysql-5.6 #MYSQL_SERVER=mysql-5.7 +#MYSQL_SERVER=mysql-8.0 #MYSQL_SERVER=mariadb-5.5 #MYSQL_SERVER=mariadb-10.0 MYSQL_SERVER=mariadb-10.1 From a9dc7c3c54be1b01c49816751db8380c53504a09 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 21 Apr 2017 22:27:37 +0200 Subject: [PATCH 2/3] DVL-006 Info about latest feature --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 045f25ad..57c15f35 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Always check out the latest git tag. The master branch is experimental and likel There is currently a huge annoyance with docker on OSX resulting in very slow file access, because of directory mounts. Read about the ticket here [Docker Forums #8076](https://forums.docker.com/t/file-access-in-mounted-volumes-extremely-slow-cpu-bound/8076). -**Latest feature:** `PostgreSQL support...` +**Latest feature:** `MySQL 8.0` ---- From 7858731dfe1b15f34e33d41b38ca4c8e60efe15b Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 21 Apr 2017 23:17:59 +0200 Subject: [PATCH 3/3] DVL-006 Adding devilbox custom mysql configuration --- .devilbox/etc/mariadb-10.0/.keepme | 0 .devilbox/etc/mariadb-10.1/.keepme | 0 .devilbox/etc/mariadb-10.2/.keepme | 0 .devilbox/etc/mariadb-5.5/.keepme | 0 .devilbox/etc/mysql-5.5/.keepme | 0 .devilbox/etc/mysql-5.6/.keepme | 0 .devilbox/etc/mysql-5.7/.keepme | 0 .devilbox/etc/mysql-8.0/.keepme | 0 .devilbox/etc/mysql-8.0/charset.cnf | 10 ++++++++++ docker-compose.yml | 3 +++ 10 files changed, 13 insertions(+) create mode 100644 .devilbox/etc/mariadb-10.0/.keepme create mode 100644 .devilbox/etc/mariadb-10.1/.keepme create mode 100644 .devilbox/etc/mariadb-10.2/.keepme create mode 100644 .devilbox/etc/mariadb-5.5/.keepme create mode 100644 .devilbox/etc/mysql-5.5/.keepme create mode 100644 .devilbox/etc/mysql-5.6/.keepme create mode 100644 .devilbox/etc/mysql-5.7/.keepme create mode 100644 .devilbox/etc/mysql-8.0/.keepme create mode 100644 .devilbox/etc/mysql-8.0/charset.cnf diff --git a/.devilbox/etc/mariadb-10.0/.keepme b/.devilbox/etc/mariadb-10.0/.keepme new file mode 100644 index 00000000..e69de29b diff --git a/.devilbox/etc/mariadb-10.1/.keepme b/.devilbox/etc/mariadb-10.1/.keepme new file mode 100644 index 00000000..e69de29b diff --git a/.devilbox/etc/mariadb-10.2/.keepme b/.devilbox/etc/mariadb-10.2/.keepme new file mode 100644 index 00000000..e69de29b diff --git a/.devilbox/etc/mariadb-5.5/.keepme b/.devilbox/etc/mariadb-5.5/.keepme new file mode 100644 index 00000000..e69de29b diff --git a/.devilbox/etc/mysql-5.5/.keepme b/.devilbox/etc/mysql-5.5/.keepme new file mode 100644 index 00000000..e69de29b diff --git a/.devilbox/etc/mysql-5.6/.keepme b/.devilbox/etc/mysql-5.6/.keepme new file mode 100644 index 00000000..e69de29b diff --git a/.devilbox/etc/mysql-5.7/.keepme b/.devilbox/etc/mysql-5.7/.keepme new file mode 100644 index 00000000..e69de29b diff --git a/.devilbox/etc/mysql-8.0/.keepme b/.devilbox/etc/mysql-8.0/.keepme new file mode 100644 index 00000000..e69de29b diff --git a/.devilbox/etc/mysql-8.0/charset.cnf b/.devilbox/etc/mysql-8.0/charset.cnf new file mode 100644 index 00000000..ffc8846f --- /dev/null +++ b/.devilbox/etc/mysql-8.0/charset.cnf @@ -0,0 +1,10 @@ +[client] +default-character-set=utf8 + +[mysql] +default-character-set=utf8 + + +[mysqld] +collation-server = utf8_unicode_ci +character-set-server = utf8 diff --git a/docker-compose.yml b/docker-compose.yml index ca81a6ca..db2a8e9d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -243,6 +243,9 @@ services: # Mount MySQL Socket directory - mysql_socket_volume:/tmp/mysql + # Mount devilbox default overwrites + - ${DEVILBOX_PATH}/.devilbox/etc/${MYSQL_SERVER}:/etc/mysql/docker-default.d:ro + # Mount devilbox user-defined cnf files in order # to overwrite the MySQL server configuration - ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/conf.d:ro