Merge branch 'issue/44-docker-integration' into 'develop'
ISSUE #44: Integrate Docker Compose See merge request rfhf19/cleanning-portalmec!50
No related branches found
No related tags found
Showing
- .dockerignore 7 additions, 0 deletions.dockerignore
- .env.dev 41 additions, 0 deletions.env.dev
- .gitignore 2 additions, 0 deletions.gitignore
- Dockerfile 27 additions, 8 deletionsDockerfile
- Gemfile 2 additions, 0 deletionsGemfile
- app/models/collection.rb 1 addition, 1 deletionapp/models/collection.rb
- app/models/learning_object.rb 1 addition, 1 deletionapp/models/learning_object.rb
- app/models/user.rb 1 addition, 1 deletionapp/models/user.rb
- config/application.rb 6 additions, 1 deletionconfig/application.rb
- config/database.yml 11 additions, 21 deletionsconfig/database.yml
- config/initializers/eager_load.rb 2 additions, 1 deletionconfig/initializers/eager_load.rb
- config/initializers/elasticsearch.rb 20 additions, 30 deletionsconfig/initializers/elasticsearch.rb
- docker-compose.yml 36 additions, 16 deletionsdocker-compose.yml
- entrypoints/docker-entrypoint.sh 12 additions, 0 deletionsentrypoints/docker-entrypoint.sh
- entrypoints/init.sql 2 additions, 0 deletionsentrypoints/init.sql
- entrypoints/sidekiq-entrypoint.sh 10 additions, 0 deletionsentrypoints/sidekiq-entrypoint.sh
- env 0 additions, 0 deletionsenv
- lib/log/database_logger.rb 26 additions, 28 deletionslib/log/database_logger.rb
- lib/log/logging.rb 17 additions, 19 deletionslib/log/logging.rb
- lib/portalmec/sociable_tests.rb 3 additions, 1 deletionlib/portalmec/sociable_tests.rb
Loading
Please register or sign in to comment