Cleanup

Watson1978 · Nov 25, 2023 · 26b14af · 26b14af
1 parent 1344029
commit 26b14af
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,10 +8,12 @@ services:
     - cassandra-data:/var/lib/cassandra
   ilios:
     build:
-      context: .
-      dockerfile: Dockerfile
+      context: ./dockerfiles
+      dockerfile: ubuntu.dockerfile
     depends_on:
     - cassandra
+    environment:
+      CASSANDRA_HOST: cassandra
     command: bash -c 'sleep infinity'
     volumes:
     - "./:/opt/ilios"

diff --git a/ilios.gemspec b/ilios.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.files =
     Dir.chdir(__dir__) do
       `git ls-files -z`.split("\x0").reject do |f|
-        (f == __FILE__) || f.match(%r{\A(?:(?:test|example)/|\.(?:git|editorconfig|rubocop.*))})
+        (f == __FILE__) || f.match(%r{\A(?:(?:test|dockerfiles|example)/|\.(?:git|editorconfig|rubocop.*))})
       end
     end
   spec.require_paths = ['lib']

diff --git a/test/helper.rb b/test/helper.rb
@@ -7,10 +7,12 @@
 
 $prepared_keyspace_and_table ||= false
 
+CASSANDRA_HOST = ENV['CASSANDRA_HOST'] || '127.0.0.1'
+
 def prepare_keyspace
   Ilios::Cassandra.config = {
     keyspace: '',
-    hosts: ['127.0.0.1']
+    hosts: [CASSANDRA_HOST]
   }
 
   session = Ilios::Cassandra.connect
@@ -27,7 +29,7 @@ def prepare_keyspace
 def prepare_table
   Ilios::Cassandra.config = {
     keyspace: 'ilios',
-    hosts: ['127.0.0.1']
+    hosts: [CASSANDRA_HOST]
   }
 
   session = Ilios::Cassandra.connect
@@ -61,5 +63,5 @@ def prepare_table
 
 Ilios::Cassandra.config = {
   keyspace: 'ilios',
-  hosts: ['127.0.0.1']
+  hosts: [CASSANDRA_HOST]
 }