diff --git a/.gitignore b/.gitignore index 8046438f921cc0a67d6bc5669f2f65ca132a96e5..05b8fd85d331fa539da4cad93551ce90f9fdb16d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ Gemfile.lock /public/assets /config/orientdb.yml /config/dspace.yml + # ignore server scripts puma.sh start_puma.sh @@ -30,3 +31,7 @@ portalmec.service portalmec-sidekiq.service sidekiq.sh autocomplete-server.service + +# ignore configs +/config/database.yml +/config/sidekiq.yml \ No newline at end of file diff --git a/README.md b/README.md index c97791ff6ddd01f6a194f5f3584bb4f29765fb63..e601b62d932b21da1b00610250c070ec666ff8c1 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ After this setup, open the config files and update some vars: #### Using docker for development env You can use docker for your development environment. For that, run: ``` ./bin/docker-setup ``` - Now, redis, elasticsearch and postgres are running as services and linked to PortalMEC application. Database migrations were execute. + Now, redis, elasticsearch and postgres are running as services and linked to PortalMEC application. Database migrations were execute and the configs (database.yml, sidekiq.yml was replaced by config/docker/...). If all development and test vars are set, run: ``` ./bin/setup ```