diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | database/Dockerfile (renamed from mongodb/Dockerfile) | 0 | ||||
| -rw-r--r-- | database/mongo-init-opendc-db.sh (renamed from mongodb/mongo-init-opendc-db.sh) | 3 | ||||
| -rwxr-xr-x | database/prefab.py (renamed from mongodb/prefab.py) | 0 | ||||
| -rwxr-xr-x | database/prefabs.py (renamed from mongodb/prefabs.py) | 0 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rw-r--r-- | web-server/README.md | 2 |
7 files changed, 5 insertions, 4 deletions
@@ -3,7 +3,7 @@ # pyenv version files .python-version -mongodb/opendc_testing/* +database/opendc_testing/* # macOS-specific files .DS_Store diff --git a/mongodb/Dockerfile b/database/Dockerfile index 12803f8e..12803f8e 100644 --- a/mongodb/Dockerfile +++ b/database/Dockerfile diff --git a/mongodb/mongo-init-opendc-db.sh b/database/mongo-init-opendc-db.sh index 5cac0a57..44fa75a3 100644 --- a/mongodb/mongo-init-opendc-db.sh +++ b/database/mongo-init-opendc-db.sh @@ -16,7 +16,8 @@ echo 'Creating collections' $MONGO_CMD --eval 'db.createCollection("users");' $MONGO_CMD --eval 'db.createCollection("projects");' $MONGO_CMD --eval 'db.createCollection("topologies");' -$MONGO_CMD --eval 'db.createCollection("experiments");' +$MONGO_CMD --eval 'db.createCollection("portfolios");' +$MONGO_CMD --eval 'db.createCollection("scenarios");' $MONGO_CMD --eval 'db.createCollection("traces");' $MONGO_CMD --eval 'db.createCollection("prefabs");' diff --git a/mongodb/prefab.py b/database/prefab.py index 124f45e3..124f45e3 100755 --- a/mongodb/prefab.py +++ b/database/prefab.py diff --git a/mongodb/prefabs.py b/database/prefabs.py index f6f46cbc..f6f46cbc 100755 --- a/mongodb/prefabs.py +++ b/database/prefabs.py diff --git a/docker-compose.yml b/docker-compose.yml index d3493e97..917312ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,7 +47,7 @@ services: mongo: build: - context: ./mongodb + context: database restart: on-failure environment: - MONGO_INITDB_ROOT_USERNAME diff --git a/web-server/README.md b/web-server/README.md index 49c605c5..84fd09cc 100644 --- a/web-server/README.md +++ b/web-server/README.md @@ -58,7 +58,7 @@ Make sure you have Python 3.7+ installed (if not, get it [here](https://www.pyth pip install -r requirements.txt ``` -The web server also requires a running MongoDB instance. We recommend setting this up through docker, by running `docker-compose build` and `docker-compose up` in the [`mongodb` directory](../mongodb) of the main OpenDC repository. +The web server also requires a running MongoDB instance. We recommend setting this up through docker, by running `docker-compose build` and `docker-compose up` in the [`mongodb` directory](../database) of the main OpenDC repository. #### Get and configure the code |