service_image_builder 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 900269f5179222514b60a9801fcb2185eca190de7549de06f0c3581acfed50a9
-  data.tar.gz: '0395906fef0ff745d19954216b22ee62afe597d52b8d6a1389cab9228f006b38'
+  metadata.gz: 3352dd551ce1f10d6d86399cebb70eacb98371b2f058898cbaa28b24a7fe233e
+  data.tar.gz: eae047d41225843eb3bdf18c0374cce6dc70cbf14c0d931e2eb1b7782eca0772
 SHA512:
-  metadata.gz: ae08276865478e406ba0982559f8dcf8d02201b03067d54476db6360ccca516408d6f01d3b2280cf968aa3b3bcfe04bdb1663c8f58f5ab8dfb6be16f06b220cb
-  data.tar.gz: 1e505048f31b20719cf88505c1e5d49c877dd4bbf1bd171aa979d141c35a9c392b9c09e54dd08ef21f10ac7c1c7c288945216ec39907ad835d693c98a972b416
+  metadata.gz: 44596d167f33a4a5abadeb51135714371d55a0fff7107d63073d59f67f5029eefc3e27afdb2d0368e1ecfbe34d244410784a6f051eb098811daf1855352f8390
+  data.tar.gz: 7ddc2ffe7e8860fd2ba65dea262300ae1cb6b2a60756d111e930c456952f6a4901d6070461e2eb352d2839b0951470fd16f0ec5613f5864a6e9b1f9b3b1eeee0

data/.gitlab-ci.yml

@@ -1,14 +1,37 @@
-image: slushsystems/ruby:latest
+variables:
+  DOCKER_DRIVER: overlay2
+  DOCKER_HOST: tcp://docker:2375/
+  SIB_IMAGE_REPO: slushsystems/service_image_builder
 
-cache:
-  paths:
-  - vendor/
-
-before_script:
-  - bundle install --deployment
-
-pre-flight check:
+build pr:
   stage: test
+  image: slushsystems/ruby:latest
+  services:
+    - name: docker:dind
+      command: ["dockerd-entrypoint.sh", "--experimental"]
+  cache:
+    paths:
+      - vendor/
+  variables:
+    SIB_PUSH: "false"
+  except:
+    - master
+  before_script:
+    - bundle install --deployment
+  script:
+    - bundle exec rake
+    - bundle exec rubocop
+    - bundle exec bin/sib
+
+build master & push:
+  stage: deploy
+  image: slushsystems/ruby:latest
+  services:
+    - name: docker:dind
+      command: ["dockerd-entrypoint.sh", "--experimental"]
+  only:
+    - master
+  before_script:
+    - bundle install --deployment
   script:
-  - bundle exec rake
-  - bundle exec rubocop
+    - bundle exec bin/sib

data/.rubocop.yml

@@ -3,7 +3,8 @@ AllCops:
     - node_modules/**/*
     - service_image_builder.gemspec
     - vendor/**/*
-Metrics/LineLength:
+  NewCops: enable
+Layout/LineLength:
   Max: 96
 Metrics/MethodLength:
   Max: 11

data/Gemfile.lock

@@ -2,85 +2,92 @@ PATH
   remote: .
   specs:
     service_image_builder (0.1.3)
-      activesupport (~> 5.2)
-      awesome_print (~> 1.8)
-      docker-api (~> 1.34)
+      activesupport (~> 6.1)
+      awesome_print (~> 1.9)
+      docker-api (~> 2.1)
       logger (~> 1.4, >= 1.4.2)
-      oj (~> 3.10)
+      oj (~> 3.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ast (2.4.0)
-    awesome_print (1.8.0)
-    byebug (11.0.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    docker-api (1.34.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    awesome_print (1.9.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    docker-api (2.1.0)
       excon (>= 0.47.0)
       multi_json
-    excon (0.71.1)
-    i18n (1.7.0)
+    excon (0.80.1)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    logger (1.4.2)
-    method_source (0.9.2)
-    minitest (5.13.0)
-    multi_json (1.14.1)
-    oj (3.10.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    logger (1.4.3)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    oj (3.11.5)
+    parallel (1.20.1)
+    parser (3.0.1.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
+      pry (~> 0.13.0)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.71.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.13.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   bundler (~> 2)
-  pry-byebug (~> 3.7)
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rubocop (~> 0.70)
+  pry-byebug (~> 3.9)
+  rake (~> 13.0)
+  rspec (~> 3.10)
+  rubocop (~> 1.13)
   service_image_builder!
 
 BUNDLED WITH
-   2.0.2
+   2.2.0

data/bin/sib

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative '../lib/service_image_builder.rb'
+require_relative '../lib/service_image_builder'
 
 # This is a sha256 sum of the ouput of `dnf list installed` which contains a
 # list of installed packages and their associated versions. A change in this
@@ -21,8 +21,22 @@ image_repo = ENV.fetch('SIB_IMAGE_REPO')
 image_upstream_tag = ENV.fetch('SIB_UPSTREAM_TAG', 'latest')
 registry_pass = ENV.fetch('SIB_REGISTRY_PASS')
 registry_user = ENV.fetch('SIB_REGISTRY_USER')
+push = ENV.fetch('SIB_PUSH', true)
 squash = ENV.fetch('SIB_SQUASH', false)
 
+# Convert boolean vars
+# TODO put this in a configuration class
+def bool!(input)
+  return input if input.is_a?(TrueClass) || input.is_a?(FalseClass)
+  return true if input == 'true'
+  return false if input == 'false'
+
+  raise 'Invalid boolean input'
+end
+
+push = bool!(push)
+squash = bool!(squash)
+
 Docker.authenticate!('username' => registry_user, 'password' => registry_pass)
 
 upstream = SIB::Image.import(repo: image_repo, tag: image_upstream_tag)
@@ -41,7 +55,7 @@ build_args = {
 
 canary = SIB::Image.build(build_args)
 
-if upstream.nil? || (canary <=> upstream).positive?
+if push && (upstream.nil? || (canary <=> upstream).positive?)
   canary.push_tag(tag: image_upstream_tag)
   canary.push_tag(tag: canary.factor_hash)
 end

data/lib/service_image_builder/errors.rb

@@ -5,6 +5,7 @@ module SIB
   class Error < StandardError
     def initialize(msg)
       SIB.log.error(msg)
+      super
     end
   end
 end

data/lib/service_image_builder/image.rb

@@ -4,10 +4,13 @@ module SIB
   # SIB::ImageError is raised when an unrecoverable error occurs in Image
   # operations
   class ImageError < SIB::Error; end
+
   # SIB::Image represents a docker image
   class Image
     attr_accessor :image, :repo
 
+    # TODO: Fix
+    # rubocop:disable Metrics/MethodLength
     def self.build(repo:, build_dir:, dockerfile: 'Dockerfile', labels: {}, squash: false)
       build_dir ||= Dir.pwd
       build_args = {
@@ -27,6 +30,7 @@ module SIB
 
       new(repo: repo, image: image)
     end
+    # rubocop:enable Metrics/MethodLength
 
     def self.import(repo:, tag:)
       new(repo: repo, image: Docker::Image.create('fromImage' => "#{repo}:#{tag}"))
@@ -108,7 +112,8 @@ module SIB
       def parse_api_response(response)
         response.split("\r\n").map { |r| Oj.load(r) }
       rescue Oj::Error => e
-        raise ImageError, "Couldn't parse api repsonse: #{e.message}"
+        SIB.log.error("Couldn't JSON parse api response: #{e.message}")
+        SIB.log.info("Unparseable message: #{response}")
       end
     end
   end

data/lib/service_image_builder/logger.rb

@@ -4,7 +4,7 @@
 module SIB
   # SIB::log serves as a module-level logging method
   def self.log
-    @log ||= Logger.new(STDOUT).tap do |lager|
+    @log ||= Logger.new($stdout).tap do |lager|
       lager.formatter = proc do |severity, datetime, progname, msg|
         out = msg.is_a?(String) ? msg : msg.ai(multiline: false)
         "#{datetime} #{severity} #{progname}: #{out}\n"

data/lib/service_image_builder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SIB
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/service_image_builder.gemspec

@@ -1,5 +1,4 @@
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'service_image_builder/version'
 
@@ -23,22 +22,22 @@ registry.'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'bin'
   spec.executables   = 'sib'
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '~> 5.2'
-  spec.add_dependency 'awesome_print', '~> 1.8'
-  spec.add_dependency 'docker-api', '~> 1.34'
+  spec.add_dependency 'activesupport', '~> 6.1'
+  spec.add_dependency 'awesome_print', '~> 1.9'
+  spec.add_dependency 'docker-api', '~> 2.1'
   spec.add_dependency 'logger', '~> 1.4', '>= 1.4.2'
-  spec.add_dependency 'oj', '~> 3.10'
+  spec.add_dependency 'oj', '~> 3.11'
 
   spec.add_development_dependency 'bundler', '~> 2'
-  spec.add_development_dependency 'pry-byebug', '~> 3.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.70'
+  spec.add_development_dependency 'pry-byebug', '~> 3.9'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rubocop', '~> 1.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: service_image_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Eric Jacobs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.34'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.34'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -106,56 +106,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '1.13'
 description: |-
   This is a Slush Systems tool for building service images. Slush Systems
   creates continuously updated and deployed infrastructure and tooling
@@ -195,7 +195,7 @@ metadata:
   homepage_uri: https://slush.systems/
   source_code_uri: https://gitlab.com/slush-systems/service_image_builder
   changelog_uri: https://gitlab.com/slush-systems/service_image_builder/commits/master
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -210,8 +210,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A tool for building and deploying Slush Systems Service Images
 test_files: []