From a8d4fe1bb9587c108ba9e05cb1c34c4636fca533 Mon Sep 17 00:00:00 2001 From: Mendel Greenberg Date: Fri, 18 Jan 2019 15:53:53 -0500 Subject: [PATCH] moved redis configuration folder into conf/ --- .../redis-conf}/pids/redis_cache.pid | 0 .../redis-conf}/pids/redis_queue.pid | 0 .../redis-conf}/pids/redis_socketio.pid | 0 .../redis-conf}/redis_cache.conf | 0 .../redis-conf}/redis_queue.conf | 0 .../redis-conf}/redis_socketio.conf | 0 docker-compose.yml | 18 +++++++++++------- 7 files changed, 11 insertions(+), 7 deletions(-) rename {redis-conf => conf/redis-conf}/pids/redis_cache.pid (100%) rename {redis-conf => conf/redis-conf}/pids/redis_queue.pid (100%) rename {redis-conf => conf/redis-conf}/pids/redis_socketio.pid (100%) rename {redis-conf => conf/redis-conf}/redis_cache.conf (100%) rename {redis-conf => conf/redis-conf}/redis_queue.conf (100%) rename {redis-conf => conf/redis-conf}/redis_socketio.conf (100%) diff --git a/redis-conf/pids/redis_cache.pid b/conf/redis-conf/pids/redis_cache.pid similarity index 100% rename from redis-conf/pids/redis_cache.pid rename to conf/redis-conf/pids/redis_cache.pid diff --git a/redis-conf/pids/redis_queue.pid b/conf/redis-conf/pids/redis_queue.pid similarity index 100% rename from redis-conf/pids/redis_queue.pid rename to conf/redis-conf/pids/redis_queue.pid diff --git a/redis-conf/pids/redis_socketio.pid b/conf/redis-conf/pids/redis_socketio.pid similarity index 100% rename from redis-conf/pids/redis_socketio.pid rename to conf/redis-conf/pids/redis_socketio.pid diff --git a/redis-conf/redis_cache.conf b/conf/redis-conf/redis_cache.conf similarity index 100% rename from redis-conf/redis_cache.conf rename to conf/redis-conf/redis_cache.conf diff --git a/redis-conf/redis_queue.conf b/conf/redis-conf/redis_queue.conf similarity index 100% rename from redis-conf/redis_queue.conf rename to conf/redis-conf/redis_queue.conf diff --git a/redis-conf/redis_socketio.conf b/conf/redis-conf/redis_socketio.conf similarity index 100% rename from redis-conf/redis_socketio.conf rename to conf/redis-conf/redis_socketio.conf diff --git a/docker-compose.yml b/docker-compose.yml index 42abf6bb..92286cde 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,22 +1,26 @@ -version: '2' +version: '3.3' services: mariadb: image: mariadb + environment: - MYSQL_ROOT_PASSWORD=123 - MYSQL_USER=root + volumes: - ./conf/mariadb-conf.d:/etc/mysql/conf.d - /var/lib/mysql + ports: - "3307:3306" #mariadb-port + container_name: mariadb redis-cache: image: redis:alpine volumes: - - ./redis-conf:/etc/conf.d + - ./conf/redis-conf:/etc/conf.d command: ["redis-server","/etc/conf.d/redis_cache.conf"] @@ -26,7 +30,7 @@ services: image: redis:alpine volumes: - - ./redis-conf:/etc/conf.d + - ./conf/redis-conf:/etc/conf.d command: ["redis-server","/etc/conf.d/redis_queue.conf"] @@ -36,7 +40,7 @@ services: image: redis:alpine volumes: - - ./redis-conf:/etc/conf.d + - ./conf/redis-conf:/etc/conf.d command: ["redis-server","/etc/conf.d/redis_socketio.conf"] @@ -46,9 +50,9 @@ services: frappe: volumes: - ./frappe-bench:/home/frappe/frappe-bench - - ./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 - - ./redis-conf/redis_socketio.conf:/home/frappe/frappe-bench/config/redis_socketio.conf + - ./conf/redis-conf/redis_cache.conf:/home/frappe/frappe-bench/config/redis_cache.conf + - ./conf/redis-conf/redis_queue.conf:/home/frappe/frappe-bench/config/redis_queue.conf + - ./conf/redis-conf/redis_socketio.conf:/home/frappe/frappe-bench/config/redis_socketio.conf build: . ports: - "8000:8000" #webserver_port