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

moved redis configuration folder into conf/

Browse source
This commit is contained in:
Mendel Greenberg 2019-01-18 15:53:53 -05:00
parent 293229e463
commit a8d4fe1bb9
No known key found for this signature in database
GPG key ID: B26A7D2DF7DC6EF7
7 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
redis-conf/pids/redis_cache.pid → conf/redis-conf/pids/redis_cache.pid
View file

0
redis-conf/pids/redis_queue.pid → conf/redis-conf/pids/redis_queue.pid
View file

0
redis-conf/pids/redis_socketio.pid → conf/redis-conf/pids/redis_socketio.pid
View file

0
redis-conf/redis_cache.conf → conf/redis-conf/redis_cache.conf
View file

0
redis-conf/redis_queue.conf → conf/redis-conf/redis_queue.conf
View file

0
redis-conf/redis_socketio.conf → conf/redis-conf/redis_socketio.conf
View file

18
docker-compose.yml
View file

@ -1,22 +1,26 @@
version: '2' version: '3.3'
services: services:
mariadb: mariadb:
image: mariadb image: mariadb
environment: environment:
- MYSQL_ROOT_PASSWORD=123 - MYSQL_ROOT_PASSWORD=123
- MYSQL_USER=root - MYSQL_USER=root
volumes: volumes:
- ./conf/mariadb-conf.d:/etc/mysql/conf.d - ./conf/mariadb-conf.d:/etc/mysql/conf.d
- /var/lib/mysql - /var/lib/mysql
ports: ports:
- "3307:3306" #mariadb-port - "3307:3306" #mariadb-port
container_name: mariadb container_name: mariadb
redis-cache: redis-cache:
image: redis:alpine image: redis:alpine
volumes: volumes:
- ./redis-conf:/etc/conf.d - ./conf/redis-conf:/etc/conf.d
command: ["redis-server","/etc/conf.d/redis_cache.conf"] command: ["redis-server","/etc/conf.d/redis_cache.conf"]
@ -26,7 +30,7 @@ services:
image: redis:alpine image: redis:alpine
volumes: volumes:
- ./redis-conf:/etc/conf.d - ./conf/redis-conf:/etc/conf.d
command: ["redis-server","/etc/conf.d/redis_queue.conf"] command: ["redis-server","/etc/conf.d/redis_queue.conf"]
@ -36,7 +40,7 @@ services:
image: redis:alpine image: redis:alpine
volumes: volumes:
- ./redis-conf:/etc/conf.d - ./conf/redis-conf:/etc/conf.d
command: ["redis-server","/etc/conf.d/redis_socketio.conf"] command: ["redis-server","/etc/conf.d/redis_socketio.conf"]
@ -46,9 +50,9 @@ services:
frappe: frappe:
volumes: volumes:
- ./frappe-bench:/home/frappe/frappe-bench - ./frappe-bench:/home/frappe/frappe-bench
- ./redis-conf/redis_cache.conf:/home/frappe/frappe-bench/config/redis_cache.conf - ./conf/redis-conf/redis_cache.conf:/home/frappe/frappe-bench/config/redis_cache.conf
- ./redis-conf/redis_queue.conf:/home/frappe/frappe-bench/config/redis_queue.conf - ./conf/redis-conf/redis_queue.conf:/home/frappe/frappe-bench/config/redis_queue.conf
- ./redis-conf/redis_socketio.conf:/home/frappe/frappe-bench/config/redis_socketio.conf - ./conf/redis-conf/redis_socketio.conf:/home/frappe/frappe-bench/config/redis_socketio.conf
build: . build: .
ports: ports:
- "8000:8000" #webserver_port - "8000:8000" #webserver_port