ood_packaging 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff0ba6ed065c5bbebe100c74e3a2c317df604b074467e5c4f60004959131e268
-  data.tar.gz: e4dc858b35504018e10de2c526c93148c1face3396f5ccb77ef73cdb6506c5f3
+  metadata.gz: c27c38bf93bd944bc4a2ea6e3e2e3ec1c847380fd63af529a78fbbf24c227b7d
+  data.tar.gz: de7ef57ce537716a66c0046d6fa27b89097ce11235516c36e8f94421ea3566e3
 SHA512:
-  metadata.gz: eb65025fd83bcb216075b111cce2f14f8c7fc5b26b56eb8c0e40233cfad76a18c30998921d07b9fefb0fdc2d3ca0c15d11c0d56f9287a68010656dbe982155e7
-  data.tar.gz: 7da737ae95148ef3cb61dab6ebf96834983a793cb5a07814cf3aa9081b99eda0eca014a22e3a49856ddcb7863523a80e559ba062da059ac29199072123400b44
+  metadata.gz: 2d5d1c157936e25191f5f4ba7a0f852cb110186098f27cb4d9b80ca90247177cbff7731adf8d4e3c5968e97d6753a68c970867529b19cc6a67d51461938e9aa9
+  data.tar.gz: 2015d40a9fc63026c601558592d1369590292280bf8e769651c1dd5cba0525f89fdb9d601ca55788506129feb51dc0ba54d02b423f43ef18f226e449e9ec5e74

data/lib/ood_packaging/build.rb

@@ -247,9 +247,13 @@ class OodPackaging::Build
 
   def install_deb_dependencies!
     sh "sudo apt update -y#{cmd_suffix}"
+    tool = [
+      'DEBIAN_FRONTEND=noninteractive apt-cudf-get --solver aspcud',
+      '-o APT::Get::Assume-Yes=1 -o Debug::pkgProblemResolver=0 -o APT::Install-Recommends=0'
+    ]
     cmd = [
       'mk-build-deps --install --remove --root-cmd sudo',
-      "--tool='DEBIAN_FRONTEND=noninteractive apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes'"
+      "--tool='#{tool.join(' ')}'"
     ]
     Dir.chdir(deb_work_dir) do
       sh "#{cmd.join(' ')}#{cmd_suffix}"

data/lib/ood_packaging/build_box/docker-image/Dockerfile.erb

@@ -33,7 +33,7 @@ RUN apt update -y && apt upgrade -y && apt clean all -y
 RUN apt update -y && apt install -y locales && locale-gen $LANG && \
     apt clean all -y
 RUN apt update -y && apt install -y apt-transport-https ca-certificates \
-    init debhelper devscripts dh-make build-essential lintian equivs \
+    init debhelper devscripts dh-make build-essential apt-cudf lintian equivs \
     sudo rake wget curl ruby bundler && \
     apt clean all -y
 RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x <%= codename %> main" > /etc/apt/sources.list.d/nodesource.list

data/lib/ood_packaging/build_box/docker-image/install.sh.erb

@@ -24,7 +24,7 @@ baseurl=https://yum.osc.edu/ondemand/build/<%= ondemand_repo_version %>/web/el\$
 enabled=1
 gpgcheck=0
 EOF
-<% if scl? -%>
+<% if legacy_gpg? -%>
 run rpm --import /build/RPM-GPG-KEY-ondemand
 <% else -%>
 run rpm --import /build/RPM-GPG-KEY-ondemand-SHA512

data/lib/ood_packaging/build_box.rb

@@ -58,6 +58,12 @@ class OodPackaging::BuildBox
     false
   end
 
+  def legacy_gpg?
+    return true if ['el7', 'el8'].include?(dist)
+
+    false
+  end
+
   def package_manager
     return 'apt' if deb?
     return 'dnf' if dnf?
@@ -136,6 +142,10 @@ class OodPackaging::BuildBox
     sh [container_runtime, 'push', image_tag].join(' ')
   end
 
+  def pull!
+    sh [container_runtime, 'pull', image_tag].join(' ')
+  end
+
   def save!(path)
     sh [container_runtime, 'save', image_tag, '| gzip >', path].join(' ')
   end

data/lib/ood_packaging/package.rb

@@ -124,7 +124,7 @@ class OodPackaging::Package
   end
 
   def default_gpg_name
-    return 'OnDemand Release Signing Key' if build_box.scl?
+    return 'OnDemand Release Signing Key' if build_box.legacy_gpg?
 
     'OnDemand Release Signing Key (SHA512)'
   end
@@ -298,7 +298,7 @@ class OodPackaging::Package
     sh cmd.join(' '), verbose: debug?
     true
   rescue RuntimeError
-    container_kill! if container_running? && attach?
+    container_kill! if container_running? && !attach?
     raise
   end
 

data/lib/ood_packaging/tasks.rb

@@ -28,6 +28,12 @@ namespace :ood_packaging do
       @build_box.push!
     end
 
+    desc 'Pull buildbox image'
+    task :pull, [:dist] do |_task, args|
+      @build_box = OodPackaging::BuildBox.new(args)
+      @build_box.pull!
+    end
+
     desc 'Save buildbox image'
     task :save, [:dist, :path] do |_task, args|
       @build_box = OodPackaging::BuildBox.new(args)

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
   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.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake