From ac5187d225adf648c0cfe5985913b5a1c666a957 Mon Sep 17 00:00:00 2001 From: Darsh Patel Date: Sun, 26 Apr 2020 14:23:35 +0530 Subject: [PATCH 1/2] Documentation Fixes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1296142fe..26cf4dacd 100644 --- a/README.md +++ b/README.md @@ -23,13 +23,13 @@ EDA Tool and Arduino on Cloud * Run Development environment - ```docker-compose -f docker-compose.dev.yml up``` + ```docker-compose -f docker-compose.dev.yml up django``` ##### For Frontend Containers and backend containers ( Please note these containers are only for dev environment, in production compiled files will be served by nginx) * To run eda-fronted along with all backend containers -``` docker-compose -f docker-compose.dev.yml run eda-frontend ``` +``` docker-compose -f docker-compose.dev.yml up eda-frontend ``` * To run eda-fronted along with all backend containers From ca9e66954125aab26a4d9e867bf15f49f0df031b Mon Sep 17 00:00:00 2001 From: Darsh Patel Date: Sun, 26 Apr 2020 14:24:05 +0530 Subject: [PATCH 2/2] Add MongoDB Container --- .env.public | 3 +++ .gitignore | 1 + docker-compose.dev.yml | 19 ++++++++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.env.public b/.env.public index 7a165d1f7..10c581355 100644 --- a/.env.public +++ b/.env.public @@ -13,3 +13,6 @@ MYSQL_PASSWORD=password SQL_DATABASE=esimcloud_db SQL_USER=user SQL_PASSWORD=password + +MONGO_INITDB_ROOT_USERNAME=user +MONGO_INITDB_ROOT_PASSWORD=password diff --git a/.gitignore b/.gitignore index ee626feb8..2bbac2802 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ mysql_data/ venv *.sqlite3 .env.prod +mongo_data/ diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 4c0f3b6c1..87688c1cd 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -15,6 +15,8 @@ services: - celery - redis - db + - mongodb + arduino-frontend: build: ./ArduinoFrontend/ command: npm start "--host 0.0.0.0" @@ -31,6 +33,8 @@ services: - celery - redis - db + - mongodb + django: build: ./esim-cloud-backend/ @@ -46,6 +50,8 @@ services: - redis - db - celery + - mongodb + env_file: - .env.public @@ -70,8 +76,19 @@ services: depends_on: - redis - db + - mongodb - + mongodb: + image: mongo:latest + container_name: "mongodb" + environment: + - MONGO_DATA_DIR=/usr/data/db/ + - MONGO_LOG_DIR=/dev/null + volumes: + - ./mongo_data:/usr/data/db + ports: + - 27017:27017 + command: mongod redis: image: "redis:alpine"