Add docker-compose for single (sqlite3) or with DB (postgresql), update some gem, get configuration from ENV

Author: jindrichskupa

Dockerfile

@@ -13,7 +13,7 @@ EXPOSE 80
 
 # Add Required Packages
 RUN apt-get update \
-	  && apt-get install -y --no-install-recommends nodejs \
+	  && apt-get install -y --no-install-recommends nodejs libpq-dev libxml2-dev default-libmysqlclient-dev libsqlite3-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Add docker entrypoint.sh
@@ -31,10 +31,6 @@ COPY . .
 # Configure database & install gems
 COPY config/database.yml.sample config/database.yml
 
-# Create database for bundled sqlite
-RUN bundle exec rake db:create
-# Run database migrations for bundled sqlite
-RUN bundle exec rake db:migrate
 # Compile the assets
 RUN bundle exec rake assets:precompile
 

Gemfile

@@ -12,6 +12,8 @@ gem 'kaminari'
 gem 'rest-client'
 gem 'libxml-ruby'
 gem 'sqlite3'
+gem 'pg', '~> 0.15'
+gem 'mysql2'
 gem 'puma'
 
 group :development, :test do

Gemfile.lock

@@ -38,27 +38,27 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.4)
-    binding_of_caller (0.7.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.1.0)
+    byebug (10.0.2)
     capybara (2.13.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (1.0.18)
-      capybara (>= 1.0, < 3)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
     capybara-webkit (1.14.0)
       capybara (>= 2.3.0, < 2.14.0)
       json
-    childprocess (0.8.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    cocoon (1.2.11)
-    concurrent-ruby (1.0.5)
+    cocoon (1.2.12)
+    concurrent-ruby (1.1.4)
     crass (1.0.4)
     cucumber (2.3.3)
       builder (>= 2.1.2)
@@ -77,21 +77,21 @@ GEM
       nokogiri (~> 1.5)
       railties (>= 3, < 5)
     cucumber-wire (0.0.1)
-    database_cleaner (1.6.2)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     execjs (2.7.0)
-    factory_bot (4.8.2)
+    factory_bot (4.11.1)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
+    factory_bot_rails (4.11.1)
+      factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    ffi (1.9.25)
-    font-awesome-rails (4.7.0.2)
-      railties (>= 3.2, < 5.2)
+    ffi (1.10.0)
+    font-awesome-rails (4.7.0.4)
+      railties (>= 3.2, < 6.0)
     foundation-rails (5.5.3.2)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
@@ -102,7 +102,7 @@ GEM
       domain_name (~> 0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -121,26 +121,28 @@ GEM
     kaminari-core (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libxml-ruby (3.0.0)
-    loofah (2.2.2)
+    libxml-ruby (3.1.0)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_test (0.1.2)
+    mysql2 (0.5.2)
     netrc (0.11.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    public_suffix (3.0.0)
-    puma (3.10.0)
-    rack (1.6.10)
+    nokogiri (1.10.0)
+      mini_portile2 (~> 2.4.0)
+    pg (0.21.0)
+    public_suffix (3.0.3)
+    puma (3.12.0)
+    rack (1.6.11)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.10)
@@ -167,33 +169,33 @@ GEM
       activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.8.0)
     rspec-matchers-controller_filters (1.0.0)
       rspec-rails (~> 3, >= 3.1)
-    rspec-mocks (3.7.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     rubyzip (1.2.2)
     sass (3.4.25)
-    sass-rails (5.0.6)
+    sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -205,9 +207,9 @@ GEM
       websocket (~> 1.0)
     shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
-    simple_form (3.5.0)
-      actionpack (> 4, < 5.2)
-      activemodel (> 4, < 5.2)
+    simple_form (4.0.0)
+      actionpack (> 4)
+      activemodel (> 4)
     spring (2.0.2)
       activesupport (>= 4.2)
     sprockets (3.7.2)
@@ -219,22 +221,22 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
     table_flipper (0.0.1)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (3.2.0)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.5)
     web-console (2.3.0)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    websocket (1.2.4)
+    websocket (1.2.8)
     xpath (2.1.0)
       nokogiri (~> 1.3)
 
@@ -256,6 +258,8 @@ DEPENDENCIES
   jquery-rails
   kaminari
   libxml-ruby
+  mysql2
+  pg (~> 0.15)
   puma
   rails (= 4.2.10)
   rest-client
@@ -272,4 +276,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.16.4
+   1.16.6

config/database.yml.sample

@@ -5,28 +5,25 @@
 #   gem 'sqlite3'
 #
 default: &default
-  adapter: sqlite3
   encoding: utf8
-  pool: 5
+  pool: 10
   timeout: 5000
 
-development:
-  <<: *default
-  database: db/development.sqlite3
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test: &test
+  <<: *default
   adapter: sqlite3
-  encoding: utf8
-  pool: 5
-  timeout: 5000
   database: db/test.sqlite3
 
-production:
+development:
   <<: *default
-  database: db/production.sqlite3
+  adapter: sqlite3
+  database: db/development.sqlite3
 
-cucumber:
-  <<: *test
+production:
+  <<: *default
+  adapter:  <%= ENV['DATABASE_ADAPTER'] || "sqlite3" %>
+  database: <%= ENV['DATABASE_NAME'] || "db/sqlite/production.sqlite3" %>
+  username: <%= ENV['DATABASE_USERNAME'] %>
+  host: <%= ENV['DATABASE_HOSTNAME'] %>
+  port: <%= ENV['DATABASE_PORT']  %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>

db/sqlite/.empty

@@ -0,0 +1,15 @@
+version: "3"
+
+services:
+  duckrails:
+    build:
+      context: .
+    ports:
+      - 8080:80
+    environment:
+      DATABASE_ADAPTER: sqlite3
+      DATABASE_NAME: db/sqlite/production.sqlite3
+      SECRET_KEY_BASE: "61867f2ea52bfcd0956063c8947abd745968b9830387aba3034c3bfd2c63d2e22519d0b14df362f85bacd3d36029139a2e5ccb0a08bd2bd88f7ef353556dd7fa"
+    restart: on-failure
+    volumes:
+      - ./db/sqlite/:/opt/duckrails/db/sqlite/

docker-compose-single.yml

@@ -0,0 +1,26 @@
+version: "3"
+
+services:
+  duckrails:
+    build:
+      context: .
+    ports:
+      - 8080:80
+    environment:
+      DATABASE_ADAPTER: postgresql
+      DATABASE_PORT: 5432
+      DATABASE_NAME: duckrails
+      DATABASE_HOSTNAME: postgres
+      DATABASE_PASSWORD: p4ssw0rd
+      DATABASE_USERNAME: postgres
+      SECRET_KEY_BASE: "61867f2ea52bfcd0956063c8947abd745968b9830387aba3034c3bfd2c63d2e22519d0b14df362f85bacd3d36029139a2e5ccb0a08bd2bd88f7ef353556dd7fa"
+    restart: on-failure
+    depends_on:
+      - postgres
+  postgres:
+    image: postgres:10
+    environment:
+      POSTGRES_DB: duckrails 
+      POSTGRES_PASSWORD: p4ssw0rd
+      POSTGRES_USERNAME: postgres
+