From 4b3d752290c3ff9cfc0044139c4c7da77fe4bfc0 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Mon, 24 Apr 2017 10:12:07 +0200
Subject: [PATCH] Change docker-compose file version and add deface target to
 Makefile [SCI-1199]

---
 Makefile                      | 4 ++++
 docker-compose.production.yml | 2 +-
 docker-compose.yml            | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7f2b4932a..946f44e0a 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
 
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index 44365731d..f1fdb456c 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -1,4 +1,4 @@
-version: '2.1'
+version: '2'
 services:
   db:
     container_name: scinote_db_production
diff --git a/docker-compose.yml b/docker-compose.yml
index bc8894c4a..e2429d0ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.1'
+version: '2'
 services:
   db:
     container_name: scinote_db_development