ETT-44: Use env vars for database config

Also: ETT-36: remove version.rb

Author: aelkiss

config/config.yml

@@ -19,10 +19,3 @@ dest_parent_dir:
   :pd_open: '/tmp/datasets/ht_text_pd_open_access'
   :pd_world: '/tmp/datasets/ht_text_pd_world'
   :pd_world_open: '/tmp/datasets/ht_text_pd_world_open_access'
-
-db:
-  adapter: mysql2
-  database: ht
-  host: mariadb-dev
-  user: datasets
-  password: datasets

config/hathitrust_config.rb

@@ -47,9 +47,14 @@ def volume_repo
       end
 
       def db_connection
-        # Example with logging enabled
-        # @db_connection ||= Sequel.connect(db.merge({loggers: [Logger.new($stdout)]}))
-        @db_connection ||= Sequel.connect(db)
+        @db_connection ||= Sequel.connect(
+          adapter: "mysql2",
+          user: ENV["MARIADB_HT_RO_USERNAME"],
+          password: ENV["MARIADB_HT_RO_PASSWORD"],
+          host: ENV["MARIADB_HT_RO_HOST"],
+          database: ENV["MARIADB_HT_RO_DATABASE"],
+          encoding: "utf8mb4"
+        )
       end
 
       def filter

docker-compose.yml

@@ -19,6 +19,10 @@ x-common-service: &common-service
   environment:
     REDIS_URL: redis://redis/
     PREVIEW_EMAIL: true
+    MARIADB_HT_RO_HOST: mariadb-dev
+    MARIADB_HT_RO_USERNAME: datasets
+    MARIADB_HT_RO_PASSWORD: datasets
+    MARIADB_HT_RO_DATABASE: ht
 
 services:
 
@@ -29,6 +33,13 @@ services:
     depends_on:
       redis: *healthy
       mariadb-test: *healthy
+    environment:
+      REDIS_URL: redis://redis/
+      PREVIEW_EMAIL: true
+      MARIADB_HT_RO_HOST: mariadb-test
+      MARIADB_HT_RO_USERNAME: datasets
+      MARIADB_HT_RO_PASSWORD: datasets
+      MARIADB_HT_RO_DATABASE: ht
 
   processor:
     <<: *common-service

lib/datasets.rb

@@ -1,5 +1,3 @@
-require "datasets/version"
-
 require "datasets/configuration"
 require "datasets/job"
 require "datasets/jobs/delete_job"

lib/datasets/version.rb

@@ -18,10 +18,3 @@ dest_parent_dir:
   :pd_open: '/tmp/integration/datasets/ht_text_pd_open_access'
   :pd_world: '/tmp/integration/datasets/ht_text_pd_world'
   :pd_world_open: '/tmp/integration/datasets/ht_text_pd_world_open_access'
-
-db:
-  adapter: mysql2
-  database: ht
-  host: mariadb-test
-  user: datasets
-  password: datasets