samus 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ae50bb62ac1a723440bdeb5b2481190be1c4c937decebdd7bf6d372c3b5373
-  data.tar.gz: 3c1995481a759d75315aff3498cf92ef2d26e600e0addc833e6ce4b2ee4c1db9
+  metadata.gz: d5abc0a8419bc2037a0f18d7473a0156909deb7e0de4d900256b5829592db883
+  data.tar.gz: 39895dfb2f089a65ff1e03cc6412011b62254d4a469ca210822a0b8adc5fccf9
 SHA512:
-  metadata.gz: c33f66b251e307696f80b26fba7a4decc6c9a9a96c9927dbe7cb51a0e341527f78991d8a8b8bddc0a8716e5095246526366a87ab3cee2cd3084e8d98efb9165c
-  data.tar.gz: 05b0bd0f94ebb9809521b4eeaac23b7d9d7890667373cabbae7e5779949c8a5c806f103577e2855a4e8976cb0a49bb9d3c433861ca447af72a7013127714dfdb
+  metadata.gz: b25b940e53902fa2d3a73f040ec78dcdd94d9d4070e831b77f8ce14c0b7cff9b14e5cfa534739abda9e4ee0158eb9dbafb03f543d8bd6125153e4c343a80882a
+  data.tar.gz: aee76adacf89dd1d58741bb16220cc53ce7d83eeb9330151e3e1fd9dced2aa462f03912e86ddd0f6931b8f6fc27dcb6748934a5587bbf800fe9af61345abdd4d

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 3.0.4 - April 1st, 2019
+
+- Automatically build Dockerfile.samus as tempfile if it is not present in
+  the repo when using `Samus::Rake::DockerReleaseTask`. This docker image
+  copies all credentials in so it can be run directly without mounts.
+- Add `mount_samus_config` option (defaults to `false`) to `DockerReleaseTask`
+  options to allow Docker image to mount the Samus configuration directory
+  from the host when publishing the image. To override the config directory,
+  specify the `SAMUS_CONFIG_PATH` environment variable to the `publish` task.
+- Add `extra_config` to `DockerReleaseTask` to allow extra files to be
+  copied into the `/root` directory of the build image. The value should be
+  a hash of src -> dest filenames to copy.
+
 # 3.0.3 - April 1st, 2019
 
 - Add `Samus::Rake::ReleaseTask` and `Samus::Rake::DockerReleaseTask` to

data/lib/samus/rake/samus_task.rb

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rake/tasklib'
-
-require_relative '../../samus'
+require 'tempfile'
+require 'fileutils'
 
 module Samus
   module Rake
@@ -23,6 +23,7 @@ module Samus
     class DockerReleaseTask < ::Rake::TaskLib
       include Helpers
 
+      PREP_DIR = '.samusprep'
       DEFAULT_DOCKERFILE = "Dockerfile.samus"
 
       attr_accessor :dockerfile
@@ -33,17 +34,56 @@ module Samus
 
       attr_accessor :git_pull_after_publish
 
+      attr_accessor :mount_samus_config
+
+      attr_accessor :extra_config
+
       def initialize(namespace = :samus)
         @namespace = namespace
         @dockerfile = DEFAULT_DOCKERFILE
         @delete_image_after_publish = true
         @git_pull_before_build = true
         @git_pull_after_publish = true
+        @mount_samus_config = false
+        @extra_config = {}
+
         yield self if block_given?
+
+        @config_files = {
+          Samus::CONFIG_PATH => '.samus',
+          File.expand_path('~/.gitconfig') => '.gitconfig'
+        }.merge(extra_config)
+
         define
       end
 
       private
+
+      def copy_prep
+        FileUtils.rm_rf(PREP_DIR)
+        FileUtils.mkdir_p(PREP_DIR)
+        @config_files.each do |src, dst|
+          FileUtils.cp_r(src, File.join(PREP_DIR, dst))
+        end
+      end
+
+      def build_or_get_dockerfile
+        return dockerfile if File.exist?(dockerfile)
+        fname = File.join(PREP_DIR, 'Dockerfile')
+        config_copies = @config_files.values.map {|f| "COPY ./#{PREP_DIR}/#{f} /root/#{f}" }
+        File.open(fname, 'w') do |f|
+          f.puts([
+            "FROM lsegal/samus:build",
+            "ARG VERSION",
+            "ENV VERSION=${VERSION}",
+            "COPY . /build",
+            config_copies.join("\n"),
+            "RUN rm -rf /build/.samusprep",
+            "RUN samus build ${VERSION}"
+          ].join("\n"))
+        end
+        fname
+      end
       
       def define
         namespace(@namespace) do
@@ -52,14 +92,20 @@ module Samus
             img = release_image
             ver = release_version
             sh "git pull" if git_pull_before_build
-            sh "docker build . -t #{img} -f #{dockerfile} --build-arg VERSION=#{ver}"
+
+            begin
+              copy_prep
+              sh "docker build . -t #{img} -f #{build_or_get_dockerfile} --build-arg VERSION=#{ver}"
+            ensure
+              FileUtils.rm_rf(PREP_DIR)
+            end
           end
 
           desc '[VERSION=X.Y.Z] Publishes a built release using Docker'
           task :publish do
             img = release_image
-            mount = "#{Samus::CONFIG_PATH}:/root/.samus:ro"
-            sh "docker run -v #{mount} --rm #{img}"
+            mount = mount_samus_config ? "-v #{Samus::CONFIG_PATH}:/root/.samus:ro" : ''
+            sh "docker run #{mount} --rm #{img}"
             sh "docker rmi -f #{img}" if delete_image_after_publish
             sh "git pull" if git_pull_after_publish
           end

data/lib/samus/version.rb

@@ -1,3 +1,3 @@
 module Samus
-  VERSION = '3.0.3'.freeze
+  VERSION = '3.0.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samus
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Loren Segal
@@ -20,7 +20,6 @@ files:
 - CHANGELOG.md
 - Dockerfile
 - Dockerfile.build
-- Dockerfile.samus
 - LICENSE
 - README.md
 - Rakefile

data/Dockerfile.samus

@@ -1,5 +0,0 @@
-FROM lsegal/samus:build
-ARG VERSION
-ENV VERSION=${VERSION}
-COPY . /build
-RUN samus build ${VERSION}