scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 06:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change docker-compose file version and add deface target to Makefile [SCI-1199]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2017-04-24 10:12:07 +02:00
parent 8bf220a972
commit 4b3d752290
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -10,6 +10,7 @@ ENABLE_TUTORIAL=true
ENABLE_RECAPTCHA=false
ENABLE_USER_CONFIRMATION=false
ENABLE_USER_REGISTRATION=true
DEFACE_ENABLED=false
endef
export PRODUCTION_CONFIG_BODY
@ -44,6 +45,9 @@ database:
database-production:
@$(MAKE) rails-production cmd="bash -c 'while ! nc -z db 5432; do sleep 1; done; rake db:create && rake db:migrate && rake db:seed'"
deface:
@$(MAKE) rails cmd="rake deface:precompile"
rails:
@docker-compose run --rm web $(cmd)

2
docker-compose.production.yml
View file

@ -1,4 +1,4 @@
version: '2.1'
version: '2'
services:
db:
container_name: scinote_db_production

2
docker-compose.yml
View file

@ -1,4 +1,4 @@
version: '2.1'
version: '2'
services:
db:
container_name: scinote_db_development