Replace docker shim with BerkeleyLibrary::Docker

Author: Daniel Schmidt

.ruby-version

@@ -0,0 +1 @@
+3.0.3

Dockerfile

@@ -69,7 +69,7 @@ RUN gem install bundler --version 2.2.33
 
 # Install gems. We don't enforce the validity of the Gemfile.lock until the
 # final (production) stage.
-COPY --chown=$APP_USER:$APP_USER Gemfile* ./
+COPY --chown=$APP_USER:$APP_USER Gemfile* .ruby-version ./
 RUN bundle install
 
 # Copy the rest of the codebase. We do this after bundle-install so that

Gemfile

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
+ruby File.read('.ruby-version').strip
+
+gem 'berkeley_library-docker', '~> 0.1.1'
 gem 'chronic', '~> 0.10.2'
 gem 'net-sftp'
 gem 'thor', '~> 1.1'

Gemfile.lock

@@ -4,6 +4,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
+    berkeley_library-docker (0.1.1)
     chronic (0.10.2)
     colorize (0.8.1)
     crack (0.4.5)
@@ -61,9 +62,11 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
+  x86_64-darwin-19
   x86_64-linux
 
 DEPENDENCIES
+  berkeley_library-docker (~> 0.1.1)
   chronic (~> 0.10.2)
   colorize
   net-sftp
@@ -76,5 +79,8 @@ DEPENDENCIES
   timecop (~> 0.9.5)
   webmock
 
+RUBY VERSION
+   ruby 3.0.3p157
+
 BUNDLED WITH
    2.2.32

bin/berkeley_library-sftp_handler.rb

@@ -4,8 +4,8 @@
   $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 end
 
-require 'docker'
-Docker::Secret.setup_environment!
+require 'berkeley_library/docker'
+BerkeleyLibrary::Docker::Secret.load_secrets!
 
 require 'berkeley_library/sftp_handler'