service_image_builder 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21806e8b7cfe2b3e9b44268a0fde515b2ad7b0a9c1ebc83e57abd59926305d97
-  data.tar.gz: f8f5c513210b0ad06629d9f6c6bea8e7a506f323a46d4731119cf4d79c58c025
+  metadata.gz: 8c8262a35662d3f437f013c16b2bc07e3a2cb2d2134540dc29f5f1658d86fbbd
+  data.tar.gz: 958a2d6ae6b05a5cb4d861c367e00e783914c9061fcba49111fd776d59da62f8
 SHA512:
-  metadata.gz: c4e3f5fbc09afc534f3b3b43f54b5d6f2bcbd756ded4e80d4525fc3a659ff88d03c669f232e7446273f1575d9417fee66a864bcb4ea54918075f603ed9604135
-  data.tar.gz: 250008f69b17e6ea30f85b2bebfa31455ae59ee0be2fbb729322c6a3a14d78d5cc11e260ddac775a7dafc332bd63b2c37d245f59c70a810e6803b4d7302b97da
+  metadata.gz: be9f00f831944d7692aa22a518c10ccfca329a9e1d11bcfb6fe9bd86bf139cb795f225b7925d5de28f3755d65fdc915aaa293c8c1ea38b651dbac833a13a05a2
+  data.tar.gz: df803efdb83c06d8b608f875cc1278af0888185f6c9464c75aaf747bb0d9633627c19be8c78eaaa317eec9676e236e493a8935663bdcfa27104bf1ac50de12b4

data/.gitlab-ci.yml

@@ -1,9 +1,14 @@
-test:
-  image: ruby:2.6
+image: slushsystems/ruby:latest
+
+cache:
+  paths:
+  - vendor/
+
+before_script:
+  - bundle install --deployment
+
+pre-flight check:
   stage: test
-  before_script:
-    - apt-get update -qy
-    - bundle install
   script:
-    - bundle exec rake
-    - rubocop
+  - bundle exec rake
+  - bundle exec rubocop

data/.rubocop.yml

@@ -1,5 +1,9 @@
 AllCops:
   Exclude:
+    - node_modules/**/*
     - service_image_builder.gemspec
+    - vendor/**/*
 Metrics/LineLength:
   Max: 96
+Metrics/MethodLength:
+  Max: 11

data/Dockerfile

@@ -0,0 +1,3 @@
+FROM slushsystems/ruby:latest
+
+RUN gem install service_image_builder

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    service_image_builder (0.1.0)
+    service_image_builder (0.1.2)
       activesupport (~> 5.2)
       docker-api (~> 1.34)
-      pry-byebug (~> 3.7)
 
 GEM
   remote: https://rubygems.org/
@@ -70,11 +69,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2)
+  pry-byebug (~> 3.7)
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop (~> 0.70)
   service_image_builder!
 
 BUNDLED WITH
-   1.17.2
+   2.0.1

data/bin/sib

@@ -19,8 +19,9 @@ current_commit_id = ENV.fetch('CI_COMMIT_SHA')
 docker_file = ENV.fetch('SIB_DOCKER_FILE', 'Dockerfile')
 image_repo = ENV.fetch('SIB_IMAGE_REPO')
 image_upstream_tag = ENV.fetch('SIB_UPSTREAM_TAG', 'latest')
-registry_user = ENV.fetch('SIB_REGISTRY_USER')
 registry_pass = ENV.fetch('SIB_REGISTRY_PASS')
+registry_user = ENV.fetch('SIB_REGISTRY_USER')
+squash = ENV.fetch('SIB_SQUASH', false)
 
 Docker.authenticate!('username' => registry_user, 'password' => registry_pass)
 
@@ -39,7 +40,7 @@ canary_build_args = {
     'systems.slush.commit-id' => current_commit_id,
     'systems.slush.timestamp' => Time.now.utc.iso8601
   }.to_json,
-  'squash' => true
+  'squash' => squash
 }
 canary = SIB::Image.new(
   image: Docker::Image.build_from_dir(build_dir, canary_build_args)

data/lib/service_image_builder/image.rb

@@ -36,12 +36,15 @@ module SIB
 
     # Image#package_manifest creates a container from @image and generates the
     # package-manifest from it
+    # TODO extract the entire factor system out into its own object
+    # After that, remove the `Metrics/MethodLength` cop override
     def package_manifest
       @package_manifest ||= String.new.tap do |manifest|
         container = Docker::Container.create(
           'Cmd' => ['/bin/bash', '-c',
                     'dnf list installed | sha256sum | colrm 65 > /package-manifest'],
-          'Image' => image.id
+          'Image' => image.id,
+          'User' => 'root'
         )
         container.tap(&:start).tap(&:wait)
         manifest << container.read_file('/package-manifest').chomp
@@ -50,7 +53,7 @@ module SIB
     end
 
     def timestamp
-      @timestamp ||= labels.fetch('systems.slush.timestamp', nil)
+      @timestamp ||= Time.parse(labels.fetch('systems.slush.timestamp', nil))
     end
   end
 end

data/lib/service_image_builder/version.rb

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

data/lib/service_image_builder.rb

@@ -5,8 +5,8 @@ require 'active_support/core_ext/time' # cherry pick Time extensions
 require 'active_support/core_ext/numeric/time' # cherry pick Time extensions
 require 'active_support/core_ext/integer/time' # cherry pick Time extensions
 require 'active_support/core_ext/object/blank' # cherry pick Object#blank?
-require 'pry-byebug'
 require 'digest'
 require 'docker'
+require 'json'
 
 require_relative 'service_image_builder/image'

data/service_image_builder.gemspec

@@ -33,7 +33,7 @@ registry.'
   spec.add_dependency 'activesupport', '~> 5.2'
   spec.add_dependency 'docker-api', '~> 1.34'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
+  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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: service_image_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Eric Jacobs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2019-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +125,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt