miriamtech-gocd 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82b62a9341f4185b558cd884679d276a927590e9bf21441d5d48ba3a76008263
-  data.tar.gz: c65cf31ead5aeb01ac0203e9868e6567df69b276ebab508ecd4cf22cb510f5be
+  metadata.gz: 9f793b1d04ccfb06de74c6ce2cb193465fceab73cea6eec430fdba9fdc70914b
+  data.tar.gz: d2cbd3b72c3eeef2dd71fa92cf5972cc585e9e68d86d9fd0475678324b500e84
 SHA512:
-  metadata.gz: 29cd1f5d5eb989ab00257bbd0723c1467ac37e4bede60cf6d5f44b4333dd993f1cc0aa03ec5db834729426c890cb694065d91abf1c7ec7ad6ce740ed5ff49f0a
-  data.tar.gz: b3f67cbbf2ccafab37e63315bf5d589b55a8d9df92ead65cc53cfb87a4e1ab9028067f61d40fe288ad222ef0a45d849ad2feb1a258307c968a999be22da98dcb
+  metadata.gz: a6c30bad571ed57e23fe61a300c8994d19fa40edd697f33dc449a5669b97a2213f0d14db3cd9896b8bd36cc89728ae02bdfd0f27ab8c4e5d6d45b78bb4427597
+  data.tar.gz: ab5fa74f84b309d6f5daabfaf5a157f54f0245c7e62284157a98c40d285bb8b88acab36c796b0d76e66d910307ef781771a834c27657225395cd93186bf6da85

data/lib/miriamtech/gocd/artifacts.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module MiriamTech
   module GoCD
     module DSL
@@ -10,7 +12,7 @@ module MiriamTech
       end
 
       def with_artifacts_volume(prefix = project_name)
-        artifacts_volume = sanitized_volume_name("#{prefix}#{build_tag}")
+        artifacts_volume = sanitized_volume_name("#{prefix}_#{random_hex}")
         docker "volume create #{artifacts_volume}"
         yield artifacts_volume
       ensure
@@ -34,6 +36,10 @@ module MiriamTech
       def sanitized_volume_name(name)
         name.gsub(/[^-_.A-Za-z0-9]/, '_')
       end
+
+      def random_hex
+        SecureRandom.hex
+      end
     end
   end
 end

data/lib/miriamtech/gocd/docker.rb

@@ -10,14 +10,21 @@ module MiriamTech
         @build_tag ||= generate_build_tag(env)
       end
 
+      def build_counter(env = ENV)
+        @build_counter ||= generate_build_counter(env)
+      end
+
       def docker(string)
         sh "docker #{string}"
       end
 
-      def docker_build_arguments(env = ENV)
+      def docker_build_arguments(env = ENV, build_args: {})
         args = ['--force-rm']
         no_cache_arg = env['DOCKER_BUILD_NO_CACHE']
         args << '--no-cache' if no_cache_arg && !FALSY_ENV_VALUES.include?(no_cache_arg)
+        build_args.each do |key, value|
+          args << "--build-arg #{key}=#{value}"
+        end
         args
       end
 
@@ -30,13 +37,13 @@ module MiriamTech
       private
 
       def generate_build_tag(env)
-        revision = env['GO_PIPELINE_COUNTER']
-        if revision
-          @build_tag = revision ? ":#{revision}" : ''
-        else
-          @build_tag = ''
-          ''
-        end
+        revision = env['GO_REVISION_SOURCE']
+        revision ? ":#{revision}" : ''
+      end
+
+      def generate_build_counter(env)
+        counter = env['GO_PIPELINE_COUNTER']
+        counter ? ":#{counter}" : ''
       end
     end
   end

data/lib/miriamtech/gocd/images.rb

@@ -17,13 +17,12 @@ module MiriamTech
       end
 
       def cleanup_old_images(image_name, number_to_keep)
-        revision_number = ENV['GO_PIPELINE_COUNTER'].to_i
-        return unless revision_number > number_to_keep
-        images = `docker images --format "{{.Repository}}:{{.Tag}}" #{image_name}`.split(/\s+/)
-        images.each do |image|
-          next unless image.match(/:(\d+)\z/)
-          next unless Regexp.last_match(1).to_i < revision_number - number_to_keep
-          docker "image rm #{image}"
+        images = `docker images --format '"{{.CreatedAt}}" id:{{.ID}}' #{image_name} | sort -r`.split("\n")
+        images.each_with_index do |image, index|
+          next if index >= number_to_keep
+          match = image.match(/id:(.*)\z/)
+          next unless match
+          docker "image rm --force #{match[1]}"
         end
       end
     end

data/lib/miriamtech/gocd/tasks.rb

@@ -8,11 +8,12 @@ module MiriamTech
 
       def define_gocd_tasks(
         image_name,
-        revisions_to_keep: 10
+        revisions_to_keep: 10,
+        build_args: {}
       )
 
         task :default => [:test]
-        task :full => [:clobber, :build]
+        task :full => [:destroy_containers, :build]
 
         task :environment do
           ENV['BUILD_TAG'] = build_tag
@@ -20,14 +21,17 @@ module MiriamTech
 
         CLEAN.add("#{root_path}/test/reports")
         task :clean => [:environment]
-        task :clobber => [:environment, :cleanup_old_images]
+        task :destroy_containers => [:environment, :clean, :cleanup_old_images]
+
+        # This is here for compatibility
+        task :clobber => :destroy_containers
 
         if compose_file.exist?
           task :clean do
             docker_compose 'stop'
           end
 
-          task :clobber do
+          task :destroy_containers do
             docker_compose 'rm -fv'
           end
         end
@@ -37,10 +41,23 @@ module MiriamTech
         end
 
         task :build => :environment do
-          docker "build #{docker_build_arguments.join(' ')} -t #{image_name}#{build_tag} #{root_path}"
+          docker "build #{docker_build_arguments(build_args: build_args).join(' ')} -t #{image_name}#{build_tag} -t #{image_name}#{build_counter} #{root_path}"
+        end
+
+        task :test => [:environment, :destroy_containers] do
+          at_exit { Rake::Task[:destroy_containers].execute }
         end
 
-        task :test => :environment
+        task :save, [:path] => :environment do | t, args |
+          args.with_defaults(path: File.join(root_path, '.docker', 'image.tar'))
+          FileUtils.mkdir_p File.dirname(args[:path])
+          docker "save #{image_name}#{build_tag} -o #{args[:path]}"
+        end
+
+        task :load, :path do | t, args |
+          args.with_defaults(path: File.join(root_path, '.docker', 'image.tar'))
+          docker "load -i #{args[:path]}"
+        end
 
         task :push do
           push(image_name)

data/lib/miriamtech/gocd/version.rb

@@ -1,5 +1,5 @@
 module MiriamTech
   module GoCD
-    VERSION = '0.2.8'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miriamtech-gocd
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Ken Treis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -159,8 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Utilities for building apps in Docker containers with GoCD