diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 22f0a85..9867fa4 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -158,8 +158,7 @@ You might use the `--no-cache` option if you want full rebuilding (`docker-compo ## Speed up with docker-sync -Docker for Mac is [slow](https://github.com/docker/for-mac/issues/77) due to poor performance when the application accesses files shared with the host machine. -One solution is to use [docker-sync](https://github.com/EugenMayer/docker-sync). +Docker on the Mac [is slow](https://github.com/docker/for-mac/issues/77), at the time of writing. Especially for larger projects, this can be a problem. The problem is [older than March 2016](https://forums.docker.com/t/file-access-in-mounted-volumes-extremely-slow-cpu-bound/8076) - as it's a such a long-running issue, we're including it in the docs here. In simple terms, docker-sync creates a docker container with a copy of all the application files that can be accessed very quickly from the other containers. On the other hand, docker-sync runs a process on the host machine that continuously tracks and updates files changes from the host to this intermediate container. @@ -810,7 +809,7 @@ docker-compose up -d mariadb phpmyadmin 1 - Run the Adminer Container (`adminer`) with the `docker-compose up` command. Example: ```bash -docker-compose up -d adminer +docker-compose up -d adminer ``` 2 - Open your browser and visit the localhost on port **8080**: `http://localhost:8080` @@ -1099,6 +1098,26 @@ To change the default forwarded port for ssh: +
+ +## Change the (MySQL) Version +By default **MySQL 8.0** is running. + +MySQL 8.0 is a development release. You may prefer to use the latest stable version, or an even older release. If you wish, you can change the MySQL image that is used. + +Open up your .env file and set the `MYSQL_VERSION` variable to the version you would like to install. + +``` +MYSQL_VERSION=5.7 +``` + +Available versions are: 5.5, 5.6, 5.7, 8.0, or latest. See https://store.docker.com/images/mysql for more information. + + + + + +
## MySQL access from host diff --git a/docker-compose.yml b/docker-compose.yml index 29b0109..4504995 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -194,6 +194,8 @@ services: mysql: build: context: ./mysql + args: + - MYSQL_VERSION=${MYSQL_VERSION} environment: - MYSQL_DATABASE=${MYSQL_DATABASE} - MYSQL_USER=${MYSQL_USER} diff --git a/env-example b/env-example index 91d295c..184b34f 100644 --- a/env-example +++ b/env-example @@ -92,6 +92,7 @@ PHP_SOCKET=php-fpm:9000 ### MYSQL ############################################################################################################## +MYSQL_VERSION=8.0 MYSQL_DATABASE=default MYSQL_USER=default MYSQL_PASSWORD=secret diff --git a/mysql/Dockerfile b/mysql/Dockerfile index 2061a0b..5eb6c40 100644 --- a/mysql/Dockerfile +++ b/mysql/Dockerfile @@ -1,4 +1,5 @@ -FROM mysql:8.0 +ARG MYSQL_VERSION=8.0 +FROM mysql:${MYSQL_VERSION} MAINTAINER Mahmoud Zalt