dlss-capistrano-docker 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c6f96926182a57be0bcdb5878ca91e311dcf030a5baed00ec86e34339669f3
-  data.tar.gz: 127342d48000c648f06d307fbbcfce9a665901ded25fdc9256390bd0eb2b6cf0
+  metadata.gz: 8932b79a00c836bd33802d012c4d66f45cbc3ebf60e3a06e9a83fe5cd49328fa
+  data.tar.gz: 60ce22d15a0486bd8f0976ce90b67256a3a967815134feb0f72f7706b034d394
 SHA512:
-  metadata.gz: ccc483796bba3f7a4c41030fd20c340934927d71816a7ce895db5802d42b2b2bb192e6bae1cacf07d4f4df48e4d6fab91c85366691287284207d9e5fa4ed577b
-  data.tar.gz: 51cf47c449b71b632a996e024e8a5e3df2feb5c0a5fe72d79d6acc8613bf7262aa9faf042436fb2b0bc32c9fe704d72895ef2f81355033fe17b092324b91b69e
+  metadata.gz: a66a6fe1680b230bdcece3aa9df76a6d13749f26beb566f67336344829d9f99e739c0dddbfcd47ca62565a6b0ef0f3ed787f96598543606c59cbb67d1bdf96c8
+  data.tar.gz: 929fd5a451a445211fc58ab22ef3e67855c84fd991ba2965930338570ab00db316dddf6a04236d429f2364ca66035bf6aeded39a6197b2f392440a65b262a5b1

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@4.2.1
+  ruby-rails: sul-dlss/ruby-rails@4.2.2
 workflows:
   build:
     jobs:

data/Gemfile.lock

@@ -1,24 +1,29 @@
 PATH
   remote: .
   specs:
-    dlss-capistrano-docker (1.1.0)
+    dlss-capistrano-docker (1.2.0)
+      bcrypt_pbkdf
       capistrano (~> 3.0)
       capistrano-bundle_audit (>= 0.3.0)
       capistrano-one_time_key
       capistrano-shared_configs
+      ed25519
 
 GEM
   remote: https://rubygems.org/
   specs:
-    airbrussh (1.5.2)
+    airbrussh (1.5.3)
       sshkit (>= 1.6.1, != 1.7.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bundler-audit (0.9.1)
+    bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.1-arm64-darwin)
+    bcrypt_pbkdf (1.1.1-x86_64-darwin)
+    bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    capistrano (3.18.1)
+    capistrano (3.19.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -27,13 +32,14 @@ GEM
       bundler-audit (~> 0.5)
       capistrano (~> 3.0)
       capistrano-bundler (>= 1.4)
-    capistrano-bundler (2.1.0)
+    capistrano-bundler (2.1.1)
       capistrano (~> 3.1)
     capistrano-one_time_key (0.2.0)
       capistrano (~> 3.0)
     capistrano-shared_configs (0.2.2)
-    concurrent-ruby (1.3.3)
-    i18n (1.14.5)
+    concurrent-ruby (1.3.4)
+    ed25519 (1.3.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
@@ -42,38 +48,36 @@ GEM
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
     net-ssh (7.2.3)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    ostruct (0.6.0)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.3.0)
-      strscan
-    rubocop (1.64.1)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
-    sshkit (1.23.0)
+    sshkit (1.23.1)
       base64
       net-scp (>= 1.1.2)
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    strscan (3.1.0)
-    thor (1.3.1)
-    unicode-display_width (2.5.0)
+      ostruct
+    thor (1.3.2)
+    unicode-display_width (2.6.0)
 
 PLATFORMS
   arm64-darwin-23

data/README.md

@@ -10,6 +10,7 @@ It requires that the services to be run on a server be specified by a docker com
 
 ## Included Tasks
 * `ssh`: establishes an SSH connection to the host running in environment, and changes into the current deployment directory.
+* `ssh_check`: establishes an SSH connection to all app servers running prints environment information to confirm the connection was made. (This is used by sdr-deploy to check SSH connections can be made in bulk before proceeding with a mass deploy.)
 * `honeybadger:notify`: notifies Honeybadger of deploy using curl (thus, ruby is not required on host).
 * `docker:login`: log into Docker Hub. Logging in is required to avoid strict image download limits.
 * `docker:logout`: log out of Docker Hub.

data/dlss-capistrano-docker.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "dlss-capistrano-docker"
-  s.version     = '1.1.0'
+  s.version     = '1.2.0'
 
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Justin Littman']
@@ -21,6 +21,9 @@ Gem::Specification.new do |s|
   s.add_dependency "capistrano-bundle_audit", ">= 0.3.0"
   s.add_dependency "capistrano-one_time_key"
   s.add_dependency "capistrano-shared_configs"
+  # support for MacOS 14.4+ usage of ed25519 SSH keys
+  s.add_dependency "ed25519"
+  s.add_dependency "bcrypt_pbkdf"
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'byebug'

data/lib/dlss/docker/capistrano/tasks/ssh_check.rake

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+desc 'check ssh connections to all app servers'
+task :ssh_check do
+  on roles(:app), in: :sequence do |host|
+    exec "ssh -l #{host.user} #{host.hostname} -p #{host.port || 22} -t 'env'"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dlss-capistrano-docker
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Justin Littman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +171,7 @@ files:
 - lib/dlss/docker/capistrano/tasks/honeybadger.rake
 - lib/dlss/docker/capistrano/tasks/shared_configs.rake
 - lib/dlss/docker/capistrano/tasks/ssh.rake
+- lib/dlss/docker/capistrano/tasks/ssh_check.rake
 homepage: https://github.com/sul-dlss/dlss-capistrano-docker
 licenses:
 - Apache-2.0
@@ -166,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.19
 signing_key:
 specification_version: 4
 summary: Capistrano recipes for use in SUL/DLSS projects for docker deployment