epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-21 15:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

some refractoring

Browse source
This commit is contained in:
Mendel Greenberg 2019-03-02 22:38:35 -05:00
parent 7271a5db3c
commit 9b09b5a532
No known key found for this signature in database
GPG key ID: B26A7D2DF7DC6EF7
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.dockerignore
View file

@ -2,6 +2,9 @@
conf/* conf/*
.travis.yml .travis.yml
test.py test.sh
README.md
LICENSE.md
.gitignore
dbench dbench
docker-*.yml docker-*.yml

2
conf/mariadb-conf.d/my.cnf
View file

@ -15,8 +15,8 @@
#collation-server = utf8_general_ci #collation-server = utf8_general_ci
#character_set_server = utf8 #character_set_server = utf8
#collation_server = utf8_general_ci #collation_server = utf8_general_ci
# Import all .cnf files from configuration directory
bind-address = 0.0.0.0 bind-address = 0.0.0.0
# Import all .cnf files from configuration directory
!includedir /etc/mysql/mariadb.conf.d/ !includedir /etc/mysql/mariadb.conf.d/

16
docker-compose.yml
View file

@ -12,7 +12,7 @@ services:
- /var/lib/mysql - /var/lib/mysql
ports: ports:
- "3307:3306" #mariadb-port - "3307:3306" # MariaDB Port
container_name: mariadb container_name: mariadb
@ -49,26 +49,32 @@ services:
frappe: frappe:
build: .
volumes: volumes:
- ./frappe-bench:/home/frappe/frappe-bench - ./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_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_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 - ./conf/redis-conf.d/redis_socketio.conf:/home/frappe/frappe-bench/config/redis_socketio.conf
build: .
ports: ports:
- "8000:8000" #webserver_port - "8000:8000" # Webserver Port
- "9000:9000" #socketio_port - "9000:9000" # Socketio Port
- "6787:6787" #file_watcher_port - "6787:6787" # File Watcher Port
stdin_open: true stdin_open: true
tty: true tty: true
links: links:
- redis-cache - redis-cache
- redis-queue - redis-queue
- redis-socketio - redis-socketio
- mariadb - mariadb
depends_on: depends_on:
- mariadb - mariadb
- redis-cache - redis-cache
- redis-queue - redis-queue
- redis-socketio - redis-socketio
container_name: frappe container_name: frappe