ood_packaging 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ca45c5fbd72d84605c193e4fbb0f24280d4ccb727f811c603dd5681024f2598
-  data.tar.gz: ffd7017ffa3ff78b14fc8336ed59419b989913b78d33630dce5e58f96354f0c7
+  metadata.gz: 0c8f037608a087f8113f5a3e4970abb47bf669173bfebb5a61104dd6f2dda0f7
+  data.tar.gz: d3a5fb3ac3ca91a3dbe262516f0e98969fa3cb256caa5cb4e29a11ee555b9c5c
 SHA512:
-  metadata.gz: f38f86f3560405b8cc48b70ecda45311203f0345775858b75f34a9716efc6150d6eda0f08f43986091b2136c141398f5a433e72e712b2b29c78bd990207d96b1
-  data.tar.gz: 2353025ec62906aa3b80dcf56c2486ec949fbc2f3944ad9d1a69c8bd2ed90e323452647aa08983ff960a0f64edf040cf68cf550ed1e498f3c3ac64d712a708f4
+  metadata.gz: 4df93eae2b6fbad8da97b87328da44d2e3867f931608da4b81999909d3bf0fcb93c6f5316b398f3d16792cfae5e325387c998ccc22ac8cf38a763a3eba7b5915
+  data.tar.gz: 59c39dffbac6fe19da9b0b904632afea4c659bf373282ffc33c0658d749d9d0bbaca4eb03fef460070ea20b887d31597b384ce9350eebcf76abca1c127b47193

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,25 +2,25 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
-      '(ubuntu|debian)' => '2.1.0',
-      'default'         => '2.1'
+      '(ubuntu|debian)' => '3.0.0',
+      'default'         => '3.0'
     },
     'ondemand-release-latest' => {
       '(ubuntu|debian)' => '1',
       'default'         => '1-7'
     },
-    'ondemand-runtime'        => '2.1.1',
+    'ondemand-runtime'        => '3.0.0',
     'passenger'               => '6.0.14',
     'cjose'                   => '0.6.1',
     'mod_auth_openidc'        => '2.4.5',
     'sqlite'                  => '3.26.0-4',
     'ondemand_exporter'       => '0.9.0',
     'ondemand-compute'        => {
-      '(ubuntu|debian)' => '2.1.0',
-      'default'         => '2.1.0'
+      '(ubuntu|debian)' => '3.0.0',
+      'default'         => '3.0.0'
     },
     'python-websockify'       => '0.10.0',
     'turbovnc'                => '2.2.5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 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: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake