rake_docker 2.20.0.pre.2 → 2.20.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '082441d261e8b8897d2da7ae2c9ad7722439f0863926907aa27735e9154d4f37'
-  data.tar.gz: d0c9a5fdfede301a1c3261b10bd48b1f0966db822f30423b4402d10f5713c8b8
+  metadata.gz: fb6a300be17d19aa913fd8ddb105bf55cb555e2fe662efe8e4156ece17bbbba9
+  data.tar.gz: c9961094001b2bea000bd5aa01cb1999ae93b29eb379858e9dc9607eb0fa75d4
 SHA512:
-  metadata.gz: 8d1d6f257f4c4c375408fbcfd35ead79843c04acdeb9036504c6066e392ff0c7d0e06cb4920602a43da9606fe6fad6ee0bdfc2c1e6180d28f10234bded9945e9
-  data.tar.gz: 2f0f6d6b5ad6c50fbba68a5ab9aaf4aafb60f96156efb301df92093b1df8f001dc0e4d5fe62ff7952d688095fb41581570d67bbaad98a08332c5f663204c386e
+  metadata.gz: f1a448a9a1a734f1e67eeaddf6bb440c9754162019b0d1af43a6221a8120c00c3ded82e685fc2db5c036fc3b3cf8fe7ba5ed76382951d1ece1fc989e8e5ca79d
+  data.tar.gz: 2ef7ddf5f0f67154e727f5f04bdd7ab09c5ee1a2422e0dfbfcbb001763cae5f7ec2b3c414a922c048ce80a5dfb3fb6ffe20bd5bd1a55ecd172d56ce9868843a9

data/CODE_OF_CONDUCT.md

@@ -5,9 +5,9 @@
 In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to making participation in our project and
 our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+size, disability, ethnicity, gender identity and expression, level of
+experience, nationality, personal appearance, race, religion, or sexual identity
+and orientation.
 
 ## Our Standards
 
@@ -23,7 +23,7 @@ include:
 Examples of unacceptable behavior by participants include:
 
 * The use of sexualized language or imagery and unwelcome sexual attention or
-advances
+  advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
@@ -37,11 +37,11 @@ Project maintainers are responsible for clarifying the standards of acceptable
 behavior and are expected to take appropriate and fair corrective action in
 response to any instances of unacceptable behavior.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, or to ban temporarily or permanently any
+contributor for other behaviors that they deem inappropriate, threatening,
+offensive, or harmful.
 
 ## Scope
 
@@ -58,8 +58,9 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by contacting the project team at maintainers@infrablocks.io. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+obligated to maintain confidentiality with regard to the reporter of an
+incident. Further details of specific enforcement policies may be posted
+separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good
 faith may face temporary or permanent repercussions as determined by other
@@ -67,8 +68,9 @@ members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
+
 [version]: http://contributor-covenant.org/version/1/4/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_docker (2.20.0.pre.2)
+    rake_docker (2.20.0.pre.4)
       aws-sdk-ecr (~> 1.2)
       colored2 (~> 3.1)
       docker-api (>= 1.34, < 3.0)
@@ -10,69 +10,97 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.686.0)
-    aws-sdk-core (3.168.4)
+    aws-partitions (1.843.0)
+    aws-sdk-core (3.185.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-ecr (1.57.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-ecr (1.65.0)
+      aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.5.2)
+    aws-sigv4 (1.6.1)
       aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
     docker-api (2.2.0)
       excon (>= 0.47.0)
       multi_json
-    excon (0.95.0)
-    faraday (2.7.2)
+    drb (2.1.1)
+      ruby2_keywords
+    excon (0.104.0)
+    faraday (2.7.11)
+      base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
     gem-release (2.2.2)
+    git (1.18.0)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    immutable-struct (2.4.1)
     jmespath (1.6.2)
     json (2.6.3)
+    language_server-protocol (3.17.0.3)
     lino (3.1.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
     memfs (1.0.0)
-    minitest (5.17.0)
+    minitest (5.20.0)
     multi_json (1.15.0)
-    octokit (6.0.1)
+    mutex_m (0.1.2)
+    octokit (6.1.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
-    parallel (1.22.1)
-    parser (3.1.3.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
-    public_suffix (5.0.1)
+      racc
+    public_suffix (5.0.3)
+    racc (1.7.1)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rake_circle_ci (0.11.0)
       colored2 (~> 3.1)
       excon (~> 0.72)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_factory (0.31.0)
+    rake_factory (0.32.0.pre.2)
       activesupport (>= 4)
       rake (~> 13.0)
+    rake_git (0.1.0.pre.7)
+      colored2 (~> 3.1)
+      git (~> 1.13, >= 1.13.2)
+      rake_factory (= 0.32.0.pre.2)
+    rake_git_crypt (0.1.0.pre.26)
+      colored2 (~> 3.1)
+      rake_factory (= 0.32.0.pre.2)
+      ruby_git_crypt (= 0.1.0.pre.2)
+      ruby_gpg2 (~> 0.6)
     rake_github (0.11.0)
       colored2 (~> 3.1)
       octokit (>= 4.16, < 7.0)
@@ -81,43 +109,54 @@ GEM
     rake_gpg (0.18.0)
       rake_factory (~> 0.23)
       ruby_gpg2 (~> 0.6)
-    rake_ssh (0.8.0)
+    rake_ssh (0.10.0)
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    regexp_parser (2.6.1)
-    rexml (3.2.5)
+    rchardet (1.8.0)
+    regexp_parser (2.8.2)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.42.0)
+    rspec-support (3.12.1)
+    rubocop (1.57.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.19.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.24.0)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.16.0)
-      rubocop (~> 1.33)
-    ruby-progressbar (1.11.0)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    ruby_git_crypt (0.1.0.pre.2)
+      immutable-struct (~> 2.4)
+      lino (~> 3.0)
     ruby_gpg2 (0.10.0)
       lino (~> 3.0)
     sawyer (0.9.2)
@@ -130,9 +169,9 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sshkey (2.0.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -145,6 +184,8 @@ DEPENDENCIES
   rake
   rake_circle_ci
   rake_docker!
+  rake_git
+  rake_git_crypt
   rake_github
   rake_gpg
   rake_ssh
@@ -155,4 +196,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.4.10
+   2.4.17

data/Rakefile

@@ -1,26 +1,59 @@
 # frozen_string_literal: true
 
-require 'yaml'
 require 'rake_circle_ci'
+require 'rake_git'
+require 'rake_git_crypt'
 require 'rake_github'
-require 'rake_ssh'
 require 'rake_gpg'
-require 'securerandom'
+require 'rake_ssh'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
+require 'securerandom'
+require 'yaml'
 
 task default: %i[
   library:fix
   test:unit
 ]
 
+RakeGitCrypt.define_standard_tasks(
+  namespace: :git_crypt,
+
+  provision_secrets_task_name: :'secrets:provision',
+  destroy_secrets_task_name: :'secrets:destroy',
+
+  install_commit_task_name: :'git:commit',
+  uninstall_commit_task_name: :'git:commit',
+
+  gpg_user_key_paths: %w[
+    config/gpg
+    config/secrets/ci/gpg.public
+  ]
+)
+
+namespace :git do
+  RakeGit.define_commit_task(
+    argument_names: [:message]
+  ) do |t, args|
+    t.message = args.message
+  end
+end
+
 namespace :encryption do
+  namespace :directory do
+    desc 'Ensure CI secrets directory exists.'
+    task :ensure do
+      FileUtils.mkdir_p('config/secrets/ci')
+    end
+  end
+
   namespace :passphrase do
     desc 'Generate encryption passphrase for CI GPG key'
-    task :generate do
-      FileUtils.mkdir_p('config/secrets/ci/')
-      File.write('config/secrets/ci/encryption.passphrase',
-                 SecureRandom.base64(36))
+    task generate: ['directory:ensure'] do
+      File.write(
+        'config/secrets/ci/encryption.passphrase',
+        SecureRandom.base64(36)
+      )
     end
   end
 end
@@ -44,6 +77,36 @@ namespace :keys do
   end
 end
 
+namespace :secrets do
+  namespace :directory do
+    desc 'Ensure secrets directory exists and is set up correctly'
+    task :ensure do
+      FileUtils.mkdir_p('config/secrets')
+      unless File.exist?('config/secrets/.unlocked')
+        File.write('config/secrets/.unlocked', 'true')
+      end
+    end
+  end
+
+  desc 'Generate all generatable secrets.'
+  task generate: %w[
+    encryption:passphrase:generate
+    keys:deploy:generate
+    keys:gpg:generate
+  ]
+
+  desc 'Provision all secrets.'
+  task provision: [:generate]
+
+  desc 'Delete all secrets.'
+  task :destroy do
+    rm_rf 'config/secrets'
+  end
+
+  desc 'Rotate all secrets.'
+  task rotate: [:'git_crypt:reinstall']
+end
+
 RuboCop::RakeTask.new
 
 namespace :library do
@@ -101,7 +164,6 @@ end
 namespace :pipeline do
   desc 'Prepare CircleCI Pipeline'
   task prepare: %i[
-    circle_ci:project:follow
     circle_ci:env_vars:ensure
     circle_ci:checkout_keys:ensure
     circle_ci:ssh_keys:ensure

data/lib/rake_docker/container.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'docker'
+require 'json'
 
 module RakeDocker
   module Container
@@ -179,7 +180,7 @@ module RakeDocker
 
       def ensure_image_available(image)
         reporter.checking_if_image_available(image)
-        matching_images = Docker::Image.all(filter: image)
+        matching_images = Docker::Image.all(filters: filters(image))
         if matching_images.empty?
           reporter.image_not_available(image)
           pull_image(image)
@@ -304,3 +305,11 @@ module RakeDocker
     end
   end
 end
+
+def filters(image)
+  JSON.generate(
+    {
+      reference: [image]
+    }
+  )
+end

data/lib/rake_docker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RakeDocker
-  VERSION = '2.20.0.pre.2'
+  VERSION = '2.20.0.pre.4'
 end

data/rake_docker.gemspec

@@ -48,6 +48,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'memfs'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rake_circle_ci'
+  spec.add_development_dependency 'rake_git'
+  spec.add_development_dependency 'rake_git_crypt'
   spec.add_development_dependency 'rake_github'
   spec.add_development_dependency 'rake_gpg'
   spec.add_development_dependency 'rake_ssh'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_docker
 version: !ruby/object:Gem::Version
-  version: 2.20.0.pre.2
+  version: 2.20.0.pre.4
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
@@ -156,6 +156,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake_git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake_git_crypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake_github
   requirement: !ruby/object:Gem::Requirement