ood_packaging 0.0.2.r2.0 → 0.0.4.r2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a6b3566973d14a67793306517648074a14a90e485adb9e16c150477f0622875
-  data.tar.gz: 1b24618f2a5ae46c8a39e759e2cae1ae9b06f439f774de56dbd084832331b1b8
+  metadata.gz: bd3aeeb95678a5bbb1364254734c6fcb29b52f0d864edc0c0f6142e03a7e5165
+  data.tar.gz: 6ffdfc8efbfb4b8cf1bd5ed7170203c40ed0a7b3f075a53a0d415bf945808b61
 SHA512:
-  metadata.gz: 1be5dc8f3a13ffc3eeeb496ed6b700ac92a78b8d84861225a01f3343b11ba6387b389794af9ceda44b7ea80b22dc364c21780d8578a1d770984165028ca4c25f
-  data.tar.gz: 47a5e5315cd46df79c3500b8c5f118217ad25303a5189c2b0b4be6de71691db00d7369766b20c95bbc12eaa35c09fb4c6d47c671252372098afa770fd5d345fa
+  metadata.gz: f72229076dfddf1dd90d3817a8bd07b4594c436bce2ba5bebf63a9f3705f8fe0aa62608d2095418339710c41d7654af3fa200e1af0baacc78758c1c8b4ff4436
+  data.tar.gz: 710040bdbcf6ef1d765d0ae9b9afbb6798e38245b6e5e7e213fc8a94fc99cd7ef836fcf85b781f67c31813c133e80f7e07f93316eb4e44fae260d25268d57de3

data/lib/ood_packaging/build_box.rb

@@ -12,10 +12,12 @@ class OodPackaging::BuildBox
   BASE_IMAGES = {
     'el7'          => 'centos:7',
     'el8'          => 'rockylinux/rockylinux:8',
+    'ubuntu-18.04' => 'ubuntu:18.04',
     'ubuntu-20.04' => 'ubuntu:20.04'
   }.freeze
 
   CODENAMES = {
+    'ubuntu-18.04' => 'bionic',
     'ubuntu-20.04' => 'focal'
   }.freeze
 

data/lib/ood_packaging/package.rb

@@ -261,7 +261,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
 
@@ -300,6 +300,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/utils.rb

@@ -67,7 +67,7 @@ module OodPackaging::Utils
   end
 
   def nodejs_version
-    '12'
+    '14'
   end
 
   def ctr_scripts_dir

data/lib/ood_packaging/version.rb

@@ -2,17 +2,17 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.0.2.r2.0'
+  VERSION = '0.0.4.r2.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
-      '(ubuntu|debian)' => '2.0.0',
+      '(ubuntu|debian)' => '2.0.1',
       'default'         => '2.0'
     },
     'ondemand-release-latest' => {
       '(ubuntu|debian)' => '1',
       'default'         => '1-7'
     },
-    'ondemand-runtime'        => '2.0-2',
+    'ondemand-runtime'        => '2.0-3',
     'passenger'               => '6.0.14',
     'cjose'                   => '0.6.1',
     'mod_auth_openidc'        => '2.4.5',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.0.2.r2.0
+  version: 0.0.4.r2.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: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake