dlss-capistrano-docker 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b180b31a5354ceec3029befccbdeac4ba5c86321eb75a1beb369d0c24a5ebbd
-  data.tar.gz: 30865848d3ef1b7c5e86565641aed355c011cf85e5219999c112a1d234d353eb
+  metadata.gz: e6c6f96926182a57be0bcdb5878ca91e311dcf030a5baed00ec86e34339669f3
+  data.tar.gz: 127342d48000c648f06d307fbbcfce9a665901ded25fdc9256390bd0eb2b6cf0
 SHA512:
-  metadata.gz: f90641ba2d8b8c60c7f22e45dfc477f163732e9aeb3b89244b5b1563e09f10913c51cdb59464dc8d015c7b5f558655d01d7b9729fbe11b541603ab0504828a53
-  data.tar.gz: dddb973eaecac7511a4a6128cdf6a0e2b065226e0e8c40547204b191ae101cb5eb3010669551831ce1a8685fb10b8e86f5854ada8044815f3d548c59c71524c8
+  metadata.gz: ccc483796bba3f7a4c41030fd20c340934927d71816a7ce895db5802d42b2b2bb192e6bae1cacf07d4f4df48e4d6fab91c85366691287284207d9e5fa4ed577b
+  data.tar.gz: 51cf47c449b71b632a996e024e8a5e3df2feb5c0a5fe72d79d6acc8613bf7262aa9faf042436fb2b0bc32c9fe704d72895ef2f81355033fe17b092324b91b69e

data/.circleci/config.yml

@@ -0,0 +1,8 @@
+version: 2.1
+orbs:
+  ruby-rails: sul-dlss/ruby-rails@4.2.1
+workflows:
+  build:
+    jobs:
+      - ruby-rails/lint:
+          name: lint

data/Gemfile.lock

@@ -1,60 +1,84 @@
 PATH
   remote: .
   specs:
-    dlss-capistrano-docker (1.0.0)
+    dlss-capistrano-docker (1.1.0)
       capistrano (~> 3.0)
+      capistrano-bundle_audit (>= 0.3.0)
       capistrano-one_time_key
       capistrano-shared_configs
 
 GEM
   remote: https://rubygems.org/
   specs:
-    airbrussh (1.4.1)
+    airbrussh (1.5.2)
       sshkit (>= 1.6.1, != 1.7.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bundler-audit (0.9.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
     byebug (11.1.3)
-    capistrano (3.17.1)
+    capistrano (3.18.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-one_time_key (0.1.0)
+    capistrano-bundle_audit (0.4.0)
+      bundler-audit (~> 0.5)
+      capistrano (~> 3.0)
+      capistrano-bundler (>= 1.4)
+    capistrano-bundler (2.1.0)
+      capistrano (~> 3.1)
+    capistrano-one_time_key (0.2.0)
       capistrano (~> 3.0)
     capistrano-shared_configs (0.2.2)
-    concurrent-ruby (1.1.10)
-    i18n (1.12.0)
+    concurrent-ruby (1.3.3)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (7.0.1)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    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)
       ast (~> 2.4.1)
+      racc
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rubocop (1.36.0)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.0)
+      strscan
+    rubocop (1.64.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      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.20.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    sshkit (1.21.3)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    sshkit (1.23.0)
+      base64
       net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    unicode-display_width (2.3.0)
+    strscan (3.1.0)
+    thor (1.3.1)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
+  arm64-darwin-23
   x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   bundler
@@ -64,4 +88,4 @@ DEPENDENCIES
   rubocop (~> 1.0)
 
 BUNDLED WITH
-   2.3.22
+   2.4.13

data/README.md

@@ -1,6 +1,8 @@
 # dlss-capistrano-docker
 
 [![Gem Version](https://badge.fury.io/rb/dlss-capistrano-docker.svg)](https://badge.fury.io/rb/dlss-capistrano-docker)
+[![CircleCI](https://circleci.com/gh/sul-dlss/dlss-capistrano-docker.svg?style=svg)](https://circleci.com/gh/sul-dlss/dlss-capistrano-docker)
+
 
 This gem provides Capistrano Docker deployment tasks used by Stanford Libraries' Digital Library Systems and Services group.
 
@@ -17,7 +19,7 @@ It requires that the services to be run on a server be specified by a docker com
 * `docker_compose:build`: build images for the services.
 * `docker_compose:setup_rabbit`: create channel, queues, etc for RabbitMQ.
 * `docker_compose:restart`: down then up services.
-* `docker_compose:up`: stop services.
+* `docker_compose:up`: start services.
 * `docker_compose:down`: tear down services.
 * `docker_compose:copy_assets`: copy assets from a container to the server so they can be served by Apache.
 * `docker_compose:dereference_linked_files`: turn linked files into actual files.
@@ -50,7 +52,7 @@ require 'dlss/capistrano'
 
 ### `config/deploy.rb`
 * For `:linked_files` remove `config/database.yml` and `config/secrets.yml` if present. Both of these will be provided by environment variables.
-* For `:linked_dirs` remove `tmp/pids`, `tmp/cache`, `tmp/sockets`, `public/system` if present. `log` and `config/settings` should remain.
+* For `:linked_dirs` remove `tmp/pids`, `tmp/cache`, `tmp/sockets` if present. `log`, `config/settings`, and, `public/system` should remain. (`public/system` is necessary for Capistrano::Maintenance.)
 * Remove any sidekiq, sneakers, passenger, whenever, or shared_configs related settings.
 * Add `set :docker_compose_file, 'docker-compose.prod.yml'` to reference the production docker-compose file.
 * Optionally, add `set :docker_compose_seed_use_hooks, true` to perform seeding.
@@ -95,4 +97,4 @@ environment:
 ```
 
 ### `.dockerignore`
-Ignore `public.assets`
+Ignore `public.assets`

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.0.0'
+  s.version     = '1.1.0'
 
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Justin Littman']
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   # All dependencies are runtime dependencies, since this gem's "runtime" is
   # the dependent gem's development-time.
   s.add_dependency "capistrano", "~> 3.0"
+  s.add_dependency "capistrano-bundle_audit", ">= 0.3.0"
   s.add_dependency "capistrano-one_time_key"
   s.add_dependency "capistrano-shared_configs"
 

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

@@ -25,6 +25,7 @@ namespace :docker do
   task :add_hub_hooks do
     after 'deploy:starting', 'docker:login'
     after 'deploy:finishing', 'docker:logout'
+    after 'deploy:finishing_rollback', 'docker:logout'
   end
 
   desc 'Log in to Docker Hub'

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

@@ -54,6 +54,7 @@ namespace :docker_compose do
 
   task :add_build_hooks do
     after 'deploy:updating', 'docker_compose:build'
+    after 'deploy:reverting', 'docker_compose:build'
   end
 
   task :add_rabbitmq_hooks do
@@ -149,7 +150,7 @@ namespace :docker_compose do
         execute(:docker, 'compose', '-f', fetch(:docker_compose_file), 'cp',
                 'app:/app/public/assets', '.')
         execute(:rm, '-fr', "#{assets_path}/*")
-        execute(:mkdir, assets_path)
+        execute(:mkdir, '-p', assets_path)
         execute(:cp, 'assets/*', "#{assets_path}/")
       end
       info 'Assets copied'

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

@@ -17,6 +17,7 @@ end
 namespace :honeybadger do
   task :add_hooks do
     after 'deploy:finishing', 'honeybadger:notify'
+    after 'deploy:finishing_rollback', 'honeybadger:notify'
   end
 
   # Replaces honeybadger:deploy to use curl instead of invoking ruby.

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

@@ -17,5 +17,6 @@ end
 namespace :shared_configs do
   task :add_hooks do
     before 'deploy:updating', 'shared_configs:update'
+    before 'deploy:reverting', 'shared_configs:update'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dlss-capistrano-docker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Justin Littman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: capistrano-bundle_audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: capistrano-one_time_key
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - Gemfile
@@ -151,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Capistrano recipes for use in SUL/DLSS projects for docker deployment