From 5b24b05867ce213db4ef6f1118ea0e07fa984a91 Mon Sep 17 00:00:00 2001
From: Florent Peyraud
Date: Tue, 19 Dec 2017 11:02:34 +0100
Subject: disable sqlite and tune install task

---
 Gemfile                | 2 +-
 Gemfile.lock           | 2 --
 lib/tasks/install.rake | 6 ++++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6bff319c3..cb2234728 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,7 +60,7 @@ gem 'faraday', '~> 0.9.1'
 platforms :ruby do
   gem 'therubyracer', '~> 0.12'
   gem 'pg'
-  gem 'sqlite3'
+  #gem 'sqlite3'
 end
 
 gem 'activerecord-postgis-adapter', "~> 3.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index b80fbac39..def02b6ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -511,7 +511,6 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.13)
     teaspoon (1.1.5)
       railties (>= 3.2.5, < 6)
     teaspoon-jasmine (2.3.4)
@@ -675,7 +674,6 @@ DEPENDENCIES
   slim-rails (~> 3.1)
   spring
   spring-commands-rspec
-  sqlite3
   teaspoon-jasmine
   therubyracer (~> 0.12)
   timecop
diff --git a/lib/tasks/install.rake b/lib/tasks/install.rake
index c5cfd3cde..22a493a62 100644
--- a/lib/tasks/install.rake
+++ b/lib/tasks/install.rake
@@ -32,8 +32,10 @@ task :pkg4docker do
   sh "git archive --format=tar --output=tmp/package/stif-boiv-release-#{release_name}.tar HEAD"
 
   sh "bundle package --all"
-  sh "RAILS_DB_ADAPTER=nulldb bundle exec rake assets:clobber RAILS_ENV=production"
-  sh "RAILS_DB_ADAPTER=nulldb bundle exec rake assets:precompile RAILS_ENV=production"
+#  sh "RAILS_DB_ADAPTER=nulldb bundle exec rake assets:clobber RAILS_ENV=production"
+#  sh "RAILS_DB_ADAPTER=nulldb bundle exec rake assets:precompile RAILS_ENV=production"
+  sh "bundle exec rake assets:clobber RAILS_ENV=production"
+  sh "bundle exec rake assets:precompile RAILS_ENV=production"
   sh "tar -rf tmp/package/stif-boiv-release-#{release_name}.tar vendor/cache"
   sh "tar -rf tmp/package/stif-boiv-release-#{release_name}.tar public/assets"
 
-- 
cgit v1.2.3