ood_packaging 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ca45c5fbd72d84605c193e4fbb0f24280d4ccb727f811c603dd5681024f2598
-  data.tar.gz: ffd7017ffa3ff78b14fc8336ed59419b989913b78d33630dce5e58f96354f0c7
+  metadata.gz: ae11128e965fd3354104bd152a71bf81df23ae7e9af3a2ab55d28fd3673c0241
+  data.tar.gz: 8eae634358befc26450275963f351861e7d77eae84ad459d8452db260eda67c3
 SHA512:
-  metadata.gz: f38f86f3560405b8cc48b70ecda45311203f0345775858b75f34a9716efc6150d6eda0f08f43986091b2136c141398f5a433e72e712b2b29c78bd990207d96b1
-  data.tar.gz: 2353025ec62906aa3b80dcf56c2486ec949fbc2f3944ad9d1a69c8bd2ed90e323452647aa08983ff960a0f64edf040cf68cf550ed1e498f3c3ac64d712a708f4
+  metadata.gz: 1317e10d1d0e7dd45c5005e0e2346cafa25d2e5158927cae070b6dcd208ab11556c5201927c8a981f3c10536feedaa4b3fb40a3885d1330f279f7b3bbb04b490
+  data.tar.gz: 5dfeeb202a9653c4b338c97e44a53de92f30e7eb723769ca5bd22cfdf4763c27c7414808221cb630d3d49ecb4af474e70fd65fc5d0cae63b516f1fce1c2b9933

data/lib/ood_packaging/build.rb

@@ -166,7 +166,8 @@ class OodPackaging::Build
     bootstrap_gpg! if gpg_sign?
     if podman_runtime?
       puts "\tBootstrap /root".blue
-      sh "cp -r #{ctr_rpmmacros} #{ctr_gpg_dir} /root/"
+      sh "cp -r #{ctr_rpmmacros} /root/"
+      sh "cp -r #{ctr_gpg_dir} /root/" if gpg_sign? && build_box.dnf?
       sh "sed -i 's|/home/ood|/root|g' /root/.rpmmacros"
     end
     puts "\tBootstrap work dir".blue

data/lib/ood_packaging/build_box.rb

@@ -92,7 +92,7 @@ class OodPackaging::BuildBox
   end
 
   def image_registry
-    @config[:builx_box_registry] || ENV['OOD_PACKAGING_BUILD_BOX_REGISTRY'] || nil
+    @config[:build_box_registry] || ENV['OOD_PACKAGING_BUILD_BOX_REGISTRY'] || nil
   end
 
   def image_org
@@ -100,7 +100,7 @@ class OodPackaging::BuildBox
   end
 
   def image_name
-    @config[:builx_box_name] || ENV['OOD_PACKAGING_BUILD_BOX_NAME'] || 'ood-buildbox'
+    @config[:build_box_name] || ENV['OOD_PACKAGING_BUILD_BOX_NAME'] || 'ood-buildbox'
   end
 
   def image_version

data/lib/ood_packaging/package.rb

@@ -263,7 +263,7 @@ class OodPackaging::Package
     puts "Build FAILED package=#{package} dist=#{build_box.dist}".red
     raise
   ensure
-    container_exec!(exec_attach, ['-i', '-t']) if attach?
+    container_attach! if attach?
     container_kill! if container_running? && !attach?
   end
 
@@ -302,6 +302,12 @@ class OodPackaging::Package
     raise
   end
 
+  def container_attach!
+    container_exec!(exec_attach, ['-i', '-t']) if attach?
+  ensure
+    container_kill! if container_running?
+  end
+
   def container_kill!
     puts "Killing container #{container_name}".blue
     cmd = [container_runtime, 'kill', container_name]

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '2.1.0',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake