Skip to content

Commit

Permalink
Fixes to Docker development environment that make it compatible with …
Browse files Browse the repository at this point in the history
…Docker for Windows too. Relevant adjustments to setup instructions too
  • Loading branch information
bdbrandt committed Feb 5, 2019
1 parent 7c03de6 commit 489da40
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
11 changes: 6 additions & 5 deletions docker-compose.yml → compose/docker-compose.yml
Expand Up @@ -2,24 +2,25 @@ 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:
- 80:80

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
Expand Down
1 change: 1 addition & 0 deletions docker/mysql/custom.cnf
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/INSTALL_DOCKER_DEV_STACK.txt
Expand Up @@ -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
Expand Down

0 comments on commit 489da40

Please sign in to comment.