dlss-capistrano-docker 1.0.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +8 -0
  3. data/Gemfile.lock +49 -25
  4. data/README.md +5 -3
  5. data/dlss-capistrano-docker.gemspec +2 -1
  6. data/lib/dlss/docker/capistrano/tasks/docker.rake +1 -0
  7. data/lib/dlss/docker/capistrano/tasks/docker_compose.rake +2 -1
  8. data/lib/dlss/docker/capistrano/tasks/honeybadger.rake +1 -0
  9. data/lib/dlss/docker/capistrano/tasks/shared_configs.rake +1 -0
  10. metadata +18 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7b180b31a5354ceec3029befccbdeac4ba5c86321eb75a1beb369d0c24a5ebbd
4
- data.tar.gz: 30865848d3ef1b7c5e86565641aed355c011cf85e5219999c112a1d234d353eb
3
+ metadata.gz: e6c6f96926182a57be0bcdb5878ca91e311dcf030a5baed00ec86e34339669f3
4
+ data.tar.gz: 127342d48000c648f06d307fbbcfce9a665901ded25fdc9256390bd0eb2b6cf0
5
5
  SHA512:
6
- metadata.gz: f90641ba2d8b8c60c7f22e45dfc477f163732e9aeb3b89244b5b1563e09f10913c51cdb59464dc8d015c7b5f558655d01d7b9729fbe11b541603ab0504828a53
7
- data.tar.gz: dddb973eaecac7511a4a6128cdf6a0e2b065226e0e8c40547204b191ae101cb5eb3010669551831ce1a8685fb10b8e86f5854ada8044815f3d548c59c71524c8
6
+ metadata.gz: ccc483796bba3f7a4c41030fd20c340934927d71816a7ce895db5802d42b2b2bb192e6bae1cacf07d4f4df48e4d6fab91c85366691287284207d9e5fa4ed577b
7
+ data.tar.gz: 51cf47c449b71b632a996e024e8a5e3df2feb5c0a5fe72d79d6acc8613bf7262aa9faf042436fb2b0bc32c9fe704d72895ef2f81355033fe17b092324b91b69e
data/.circleci/config.yml ADDED
@@ -0,0 +1,8 @@
1
+ version: 2.1
2
+ orbs:
3
+ ruby-rails: sul-dlss/ruby-rails@4.2.1
4
+ workflows:
5
+ build:
6
+ jobs:
7
+ - ruby-rails/lint:
8
+ name: lint
data/Gemfile.lock CHANGED
@@ -1,60 +1,84 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- dlss-capistrano-docker (1.0.0)
4
+ dlss-capistrano-docker (1.1.0)
5
5
  capistrano (~> 3.0)
6
+ capistrano-bundle_audit (>= 0.3.0)
6
7
  capistrano-one_time_key
7
8
  capistrano-shared_configs
8
9
 
9
10
  GEM
10
11
  remote: https://rubygems.org/
11
12
  specs:
12
- airbrussh (1.4.1)
13
+ airbrussh (1.5.2)
13
14
  sshkit (>= 1.6.1, != 1.7.0)
14
15
  ast (2.4.2)
16
+ base64 (0.2.0)
17
+ bundler-audit (0.9.1)
18
+ bundler (>= 1.2.0, < 3)
19
+ thor (~> 1.0)
15
20
  byebug (11.1.3)
16
- capistrano (3.17.1)
21
+ capistrano (3.18.1)
17
22
  airbrussh (>= 1.0.0)
18
23
  i18n
19
24
  rake (>= 10.0.0)
20
25
  sshkit (>= 1.9.0)
21
- capistrano-one_time_key (0.1.0)
26
+ capistrano-bundle_audit (0.4.0)
27
+ bundler-audit (~> 0.5)
28
+ capistrano (~> 3.0)
29
+ capistrano-bundler (>= 1.4)
30
+ capistrano-bundler (2.1.0)
31
+ capistrano (~> 3.1)
32
+ capistrano-one_time_key (0.2.0)
22
33
  capistrano (~> 3.0)
23
34
  capistrano-shared_configs (0.2.2)
24
- concurrent-ruby (1.1.10)
25
- i18n (1.12.0)
35
+ concurrent-ruby (1.3.3)
36
+ i18n (1.14.5)
26
37
  concurrent-ruby (~> 1.0)
27
- json (2.6.2)
28
- net-scp (1.2.1)
29
- net-ssh (>= 2.6.5)
30
- net-ssh (7.0.1)
31
- parallel (1.22.1)
32
- parser (3.1.2.1)
38
+ json (2.7.2)
39
+ language_server-protocol (3.17.0.3)
40
+ net-scp (4.0.0)
41
+ net-ssh (>= 2.6.5, < 8.0.0)
42
+ net-sftp (4.0.0)
43
+ net-ssh (>= 5.0.0, < 8.0.0)
44
+ net-ssh (7.2.3)
45
+ parallel (1.25.1)
46
+ parser (3.3.3.0)
33
47
  ast (~> 2.4.1)
48
+ racc
49
+ racc (1.8.0)
34
50
  rainbow (3.1.1)
35
- rake (13.0.6)
36
- regexp_parser (2.5.0)
37
- rexml (3.2.5)
38
- rubocop (1.36.0)
51
+ rake (13.2.1)
52
+ regexp_parser (2.9.2)
53
+ rexml (3.3.0)
54
+ strscan
55
+ rubocop (1.64.1)
39
56
  json (~> 2.3)
57
+ language_server-protocol (>= 3.17.0)
40
58
  parallel (~> 1.10)
41
- parser (>= 3.1.2.1)
59
+ parser (>= 3.3.0.2)
42
60
  rainbow (>= 2.2.2, < 4.0)
43
61
  regexp_parser (>= 1.8, < 3.0)
44
62
  rexml (>= 3.2.5, < 4.0)
45
- rubocop-ast (>= 1.20.1, < 2.0)
63
+ rubocop-ast (>= 1.31.1, < 2.0)
46
64
  ruby-progressbar (~> 1.7)
47
- unicode-display_width (>= 1.4.0, < 3.0)
48
- rubocop-ast (1.21.0)
49
- parser (>= 3.1.1.0)
50
- ruby-progressbar (1.11.0)
51
- sshkit (1.21.3)
65
+ unicode-display_width (>= 2.4.0, < 3.0)
66
+ rubocop-ast (1.31.3)
67
+ parser (>= 3.3.1.0)
68
+ ruby-progressbar (1.13.0)
69
+ sshkit (1.23.0)
70
+ base64
52
71
  net-scp (>= 1.1.2)
72
+ net-sftp (>= 2.1.2)
53
73
  net-ssh (>= 2.8.0)
54
- unicode-display_width (2.3.0)
74
+ strscan (3.1.0)
75
+ thor (1.3.1)
76
+ unicode-display_width (2.5.0)
55
77
 
56
78
  PLATFORMS
79
+ arm64-darwin-23
57
80
  x86_64-darwin-21
81
+ x86_64-linux
58
82
 
59
83
  DEPENDENCIES
60
84
  bundler
@@ -64,4 +88,4 @@ DEPENDENCIES
64
88
  rubocop (~> 1.0)
65
89
 
66
90
  BUNDLED WITH
67
- 2.3.22
91
+ 2.4.13
data/README.md CHANGED
@@ -1,6 +1,8 @@
1
1
  # dlss-capistrano-docker
2
2
 
3
3
  [![Gem Version](https://badge.fury.io/rb/dlss-capistrano-docker.svg)](https://badge.fury.io/rb/dlss-capistrano-docker)
4
+ [![CircleCI](https://circleci.com/gh/sul-dlss/dlss-capistrano-docker.svg?style=svg)](https://circleci.com/gh/sul-dlss/dlss-capistrano-docker)
5
+
4
6
 
5
7
  This gem provides Capistrano Docker deployment tasks used by Stanford Libraries' Digital Library Systems and Services group.
6
8
 
@@ -17,7 +19,7 @@ It requires that the services to be run on a server be specified by a docker com
17
19
  * `docker_compose:build`: build images for the services.
18
20
  * `docker_compose:setup_rabbit`: create channel, queues, etc for RabbitMQ.
19
21
  * `docker_compose:restart`: down then up services.
20
- * `docker_compose:up`: stop services.
22
+ * `docker_compose:up`: start services.
21
23
  * `docker_compose:down`: tear down services.
22
24
  * `docker_compose:copy_assets`: copy assets from a container to the server so they can be served by Apache.
23
25
  * `docker_compose:dereference_linked_files`: turn linked files into actual files.
@@ -50,7 +52,7 @@ require 'dlss/capistrano'
50
52
 
51
53
  ### `config/deploy.rb`
52
54
  * For `:linked_files` remove `config/database.yml` and `config/secrets.yml` if present. Both of these will be provided by environment variables.
53
- * For `:linked_dirs` remove `tmp/pids`, `tmp/cache`, `tmp/sockets`, `public/system` if present. `log` and `config/settings` should remain.
55
+ * 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.)
54
56
  * Remove any sidekiq, sneakers, passenger, whenever, or shared_configs related settings.
55
57
  * Add `set :docker_compose_file, 'docker-compose.prod.yml'` to reference the production docker-compose file.
56
58
  * Optionally, add `set :docker_compose_seed_use_hooks, true` to perform seeding.
@@ -95,4 +97,4 @@ environment:
95
97
  ```
96
98
 
97
99
  ### `.dockerignore`
98
- Ignore `public.assets`
100
+ Ignore `public.assets`
data/dlss-capistrano-docker.gemspec CHANGED
@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |s|
6
6
  s.name = "dlss-capistrano-docker"
7
- s.version = '1.0.0'
7
+ s.version = '1.1.0'
8
8
 
9
9
  s.platform = Gem::Platform::RUBY
10
10
  s.authors = ['Justin Littman']
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
18
18
  # All dependencies are runtime dependencies, since this gem's "runtime" is
19
19
  # the dependent gem's development-time.
20
20
  s.add_dependency "capistrano", "~> 3.0"
21
+ s.add_dependency "capistrano-bundle_audit", ">= 0.3.0"
21
22
  s.add_dependency "capistrano-one_time_key"
22
23
  s.add_dependency "capistrano-shared_configs"
23
24
 
data/lib/dlss/docker/capistrano/tasks/docker.rake CHANGED
@@ -25,6 +25,7 @@ namespace :docker do
25
25
  task :add_hub_hooks do
26
26
  after 'deploy:starting', 'docker:login'
27
27
  after 'deploy:finishing', 'docker:logout'
28
+ after 'deploy:finishing_rollback', 'docker:logout'
28
29
  end
29
30
 
30
31
  desc 'Log in to Docker Hub'
data/lib/dlss/docker/capistrano/tasks/docker_compose.rake CHANGED
@@ -54,6 +54,7 @@ namespace :docker_compose do
54
54
 
55
55
  task :add_build_hooks do
56
56
  after 'deploy:updating', 'docker_compose:build'
57
+ after 'deploy:reverting', 'docker_compose:build'
57
58
  end
58
59
 
59
60
  task :add_rabbitmq_hooks do
@@ -149,7 +150,7 @@ namespace :docker_compose do
149
150
  execute(:docker, 'compose', '-f', fetch(:docker_compose_file), 'cp',
150
151
  'app:/app/public/assets', '.')
151
152
  execute(:rm, '-fr', "#{assets_path}/*")
152
- execute(:mkdir, assets_path)
153
+ execute(:mkdir, '-p', assets_path)
153
154
  execute(:cp, 'assets/*', "#{assets_path}/")
154
155
  end
155
156
  info 'Assets copied'
data/lib/dlss/docker/capistrano/tasks/honeybadger.rake CHANGED
@@ -17,6 +17,7 @@ end
17
17
  namespace :honeybadger do
18
18
  task :add_hooks do
19
19
  after 'deploy:finishing', 'honeybadger:notify'
20
+ after 'deploy:finishing_rollback', 'honeybadger:notify'
20
21
  end
21
22
 
22
23
  # Replaces honeybadger:deploy to use curl instead of invoking ruby.
data/lib/dlss/docker/capistrano/tasks/shared_configs.rake CHANGED
@@ -17,5 +17,6 @@ end
17
17
  namespace :shared_configs do
18
18
  task :add_hooks do
19
19
  before 'deploy:updating', 'shared_configs:update'
20
+ before 'deploy:reverting', 'shared_configs:update'
20
21
  end
21
22
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dlss-capistrano-docker
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Littman
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-09-28 00:00:00.000000000 Z
11
+ date: 2024-06-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: capistrano
@@ -24,6 +24,20 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '3.0'
27
+ - !ruby/object:Gem::Dependency
28
+ name: capistrano-bundle_audit
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ">="
32
+ - !ruby/object:Gem::Version
33
+ version: 0.3.0
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ version: 0.3.0
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: capistrano-one_time_key
29
43
  requirement: !ruby/object:Gem::Requirement
@@ -115,6 +129,7 @@ executables: []
115
129
  extensions: []
116
130
  extra_rdoc_files: []
117
131
  files:
132
+ - ".circleci/config.yml"
118
133
  - ".gitignore"
119
134
  - ".rubocop.yml"
120
135
  - Gemfile
@@ -151,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
151
166
  - !ruby/object:Gem::Version
152
167
  version: '0'
153
168
  requirements: []
154
- rubygems_version: 3.3.7
169
+ rubygems_version: 3.5.9
155
170
  signing_key:
156
171
  specification_version: 4
157
172
  summary: Capistrano recipes for use in SUL/DLSS projects for docker deployment