From 43df7fc21cd75e12061e5d3515470e67d4c04838 Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <dcschmidt@berkeley.edu>
Date: Mon, 18 Dec 2023 21:48:33 -0800
Subject: [PATCH] Load Docker secrets in tests and the gingr command

---
 Gemfile             | 1 +
 Gemfile.lock        | 2 ++
 bin/gingr           | 4 +++-
 spec/spec_helper.rb | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 8a024e2..891f47d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 ruby File.read('.ruby-version')
 
+gem "berkeley_library-docker", "~> 0.2.0"
 gem 'berkeley_library-logging', '~> 0.2'
 gem 'faraday-net_http_persistent', '~> 2.0'
 gem 'geo_combine'
diff --git a/Gemfile.lock b/Gemfile.lock
index d523591..a28ef1b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,6 +30,7 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     amazing_print (1.5.0)
     base64 (0.1.1)
+    berkeley_library-docker (0.2.0)
     berkeley_library-logging (0.2.7)
       activesupport (>= 6)
       amazing_print (~> 1.1)
@@ -174,6 +175,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  berkeley_library-docker (~> 0.2.0)
   berkeley_library-logging (~> 0.2)
   faraday-net_http_persistent (~> 2.0)
   geo_combine
diff --git a/bin/gingr b/bin/gingr
index 79275c9..d69e435 100755
--- a/bin/gingr
+++ b/bin/gingr
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
-require_relative '../lib/gingr'
+require 'berkeley_library/docker'
+BerkeleyLibrary::Docker::Secret.load_secrets!
 
+require_relative '../lib/gingr'
 Gingr::Cli.start(ARGV)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6f14699..2ac62e9 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,7 @@
 # frozen_string_literal: true
+require 'berkeley_library/docker'
+BerkeleyLibrary::Docker::Secret.load_secrets!
+
 $LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
 require 'gingr'