From 489da407b48eed96ff999c77282cd6a92cca32c7 Mon Sep 17 00:00:00 2001 From: bdbrandt Date: Tue, 5 Feb 2019 15:31:40 -0600 Subject: [PATCH] Fixes to Docker development environment that make it compatible with Docker for Windows too. Relevant adjustments to setup instructions too --- docker-compose.yml => compose/docker-compose.yml | 11 ++++++----- docker/mysql/custom.cnf | 1 + docs/INSTALL_DOCKER_DEV_STACK.txt | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) rename docker-compose.yml => compose/docker-compose.yml (62%) diff --git a/docker-compose.yml b/compose/docker-compose.yml similarity index 62% rename from docker-compose.yml rename to compose/docker-compose.yml index 62a2ff7dac..d4a4297338 100755 --- a/docker-compose.yml +++ b/compose/docker-compose.yml @@ -2,12 +2,12 @@ version: '3' services: apache: - build: ./docker/apache + build: ../docker/apache container_name: apache restart: always volumes: - - ./docker/apache/vhosts:/etc/apache2/sites-enabled - - .:/home/wwwroot/symbiota + - ../docker/apache/vhosts:/etc/apache2/sites-enabled + - ../:/home/wwwroot/symbiota depends_on: - mariadb ports: @@ -15,11 +15,12 @@ services: mariadb: image: mariadb:10.4 + container_name: mariadb restart: always command: "--default-authentication-plugin=mysql_native_password" volumes: - - ./docker/mysql/custom.cnf:/etc/mysql/conf.d/custom.cnf - - ./data:/var/lib/mysql + - ../docker/mysql/custom.cnf:/etc/mysql/conf.d/custom.cnf + - ../data:/var/lib/mysql environment: MYSQL_ROOT_PASSWORD: password MYSQL_DATABASE: symbiota diff --git a/docker/mysql/custom.cnf b/docker/mysql/custom.cnf index a1ed88a7bf..c33d7a8d89 100755 --- a/docker/mysql/custom.cnf +++ b/docker/mysql/custom.cnf @@ -3,4 +3,5 @@ character-set-server = utf8 collation-server = utf8_unicode_ci skip-character-set-client-handshake max_allowed_packet=100M +bind-address=0.0.0.0 sql_mode=IGNORE_SPACE,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION diff --git a/docs/INSTALL_DOCKER_DEV_STACK.txt b/docs/INSTALL_DOCKER_DEV_STACK.txt index 60ef63d8b5..6fda6c55c3 100644 --- a/docs/INSTALL_DOCKER_DEV_STACK.txt +++ b/docs/INSTALL_DOCKER_DEV_STACK.txt @@ -25,7 +25,7 @@ TO INSTALL THE DEVELOPMENT DOCKER STACK INCLUDED WITH THIS SOFTWARE preference * Start the Docker development stack: a. Start the Docker CLI on your system (if it is not already running) - b. Navigate to the root directory of this Symbiota installation + b. Navigate to the compose directory of this Symbiota installation c. Run: docker-compose up -d d. The first time the development stack is started it will take longer to start as both of the docker images are built