Merge pull request 'Cache dependencies on CI' (#6) from chore/cache_bundle_on_ci into master

Reviewed-on: #6

.drone.yml

@@ -3,12 +3,35 @@ type: docker
 name: CI build
 
 steps:
+  - name: restore-cache
+    image: drillster/drone-volume-cache
+    volumes:
+    - name: cache
+      path: /cache
+    settings:
+      restore: true
+      mount:
+      - vendor
   - name: rspec
     image: guildeducation/rails:2.7.1-12.19.0
     commands:
-      - bundle install --jobs=3 --retry=3
+      - bundle install --jobs=3 --retry=3 --deployment
       - yarn install
       - bundle exec rspec
     when:
       branch:
         - master
+  - name: rebuild-cache
+    image: drillster/drone-volume-cache
+    volumes:
+    - name: cache
+      path: /cache
+    settings:
+      rebuild: true
+      mount:
+      - vendor
+
+volumes:
+  - name: cache
+    host:
+      path: /var/lib/drone/tmp

Gemfile

@@ -3,8 +3,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
 gem 'puma', '~> 4.1'
 # Use SCSS for stylesheets
@@ -31,6 +29,8 @@ gem 'devise_ldap_authenticatable'
 gem 'net-ldap'
 
 group :development, :test do
+  # Use sqlite3 as the database for Active Record
+  gem 'sqlite3', '~> 1.4'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
 end
@@ -53,5 +53,9 @@ group :test do
   gem 'database_cleaner'
 end
 
+group :production do
+  # Use postgresql as the database for Active Record
+  gem 'pg', '~> 1.2.3'
+end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

Gemfile.lock

@@ -131,6 +131,7 @@ GEM
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
+    pg (1.2.3)
     public_suffix (4.0.6)
     puma (4.3.6)
       nio4r (~> 2.0)
@@ -255,6 +256,7 @@ DEPENDENCIES
   letter_opener_web
   listen (~> 3.2)
   net-ldap
+  pg (~> 1.2.3)
   puma (~> 4.1)
   rails (~> 6.0.3, >= 6.0.3.4)
   rspec-rails

config/database.yml

@@ -25,6 +25,6 @@ production:
   adapter: postgresql
   database: akkounts
   port: 5432
-  host: <%= Rails.application.credentials.postgres[:host] %>
+  host: <%= Rails.application.credentials.postgres[:host] rescue nil %>
-  username: <%= Rails.application.credentials.postgres[:username] %>
+  username: <%= Rails.application.credentials.postgres[:username] rescue nil %>
-  password: <%= Rails.application.credentials.postgres[:password] %>
+  password: <%= Rails.application.credentials.postgres[:password] rescue nil %>

config/environments/production.rb

@@ -64,7 +64,7 @@ Rails.application.configure do
   config.action_mailer.smtp_settings = {
     address: "mail.gandi.net",
     port: "587",
-    authentication: plain,
+    authentication: "plain",
     enable_starttls_auto: true,
     user_name: Rails.application.credentials.smtp[:username],
     password: Rails.application.credentials.smtp[:password]

config/initializers/devise.rb

@@ -49,7 +49,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+  config.mailer_sender = 'accounts@kosmos.org'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'

config/ldap.yml

@@ -50,7 +50,7 @@ production:
   port: 636
   attribute: cn
   base: ou=kosmos.org,cn=users,dc=kosmos,dc=org
-  admin_user: <%= Rails.application.credentials.ldap[:username] %>
+  admin_user: <%= Rails.application.credentials.ldap[:username] rescue nil %>
-  admin_password: <%= Rails.application.credentials.ldap[:password] %>
+  admin_password: <%= Rails.application.credentials.ldap[:password] rescue nil %>
   ssl: simple_tls
   # <<: *AUTHORIZATIONS