ETT-44: Use env vars for database config

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

@@ -8,6 +8,14 @@ x-healthcheck-defaults: &healthcheck-defaults
   start_period: 10s
   retries: 5
 
+x-environment: &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
+
 x-common-service: &common-service
   build:
     context: .
@@ -16,9 +24,7 @@ x-common-service: &common-service
     - .:/usr/src/app
     - gem_cache:/gems
     - ./example/datasets:/tmp/datasets
-  environment:
-    REDIS_URL: redis://redis/
-    PREVIEW_EMAIL: true
+  environment: *environment
 
 services:
 
@@ -29,6 +35,9 @@ services:
     depends_on:
       redis: *healthy
       mariadb-test: *healthy
+    environment:
+      <<: *environment
+      MARIADB_HT_RO_HOST: mariadb-test
 
   processor:
     <<: *common-service

lib/datasets.rb

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

spec/support/config/integration.yml

@@ -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