diff --git a/.dockerignore b/.dockerignore index 37f67d5a..455769b0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,6 +2,9 @@ conf/* .travis.yml -test.py +test.sh +README.md +LICENSE.md +.gitignore dbench docker-*.yml \ No newline at end of file diff --git a/conf/mariadb-conf.d/my.cnf b/conf/mariadb-conf.d/my.cnf index 5b99beba..67decf83 100644 --- a/conf/mariadb-conf.d/my.cnf +++ b/conf/mariadb-conf.d/my.cnf @@ -15,8 +15,8 @@ #collation-server = utf8_general_ci #character_set_server = utf8 #collation_server = utf8_general_ci -# Import all .cnf files from configuration directory bind-address = 0.0.0.0 +# Import all .cnf files from configuration directory !includedir /etc/mysql/mariadb.conf.d/ diff --git a/docker-compose.yml b/docker-compose.yml index 0b8362d5..a24d2283 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - /var/lib/mysql ports: - - "3307:3306" #mariadb-port + - "3307:3306" # MariaDB Port container_name: mariadb @@ -49,26 +49,32 @@ services: frappe: + build: . + volumes: - ./frappe-bench:/home/frappe/frappe-bench - ./conf/redis-conf.d/redis_cache.conf:/home/frappe/frappe-bench/config/redis_cache.conf - ./conf/redis-conf.d/redis_queue.conf:/home/frappe/frappe-bench/config/redis_queue.conf - ./conf/redis-conf.d/redis_socketio.conf:/home/frappe/frappe-bench/config/redis_socketio.conf - build: . + ports: - - "8000:8000" #webserver_port - - "9000:9000" #socketio_port - - "6787:6787" #file_watcher_port + - "8000:8000" # Webserver Port + - "9000:9000" # Socketio Port + - "6787:6787" # File Watcher Port + stdin_open: true tty: true + links: - redis-cache - redis-queue - redis-socketio - mariadb + depends_on: - mariadb - redis-cache - redis-queue - redis-socketio + container_name: frappe