ood_packaging 0.12.1 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bd56c23ece9ab15fb8e43934f481e79505c14864198fa1ca99b17b6acf80640
-  data.tar.gz: 5b92c3a6cdd936faa0136c624f31fec04dad7f94bd70112bdcbecb53521f8fd3
+  metadata.gz: 37ac7ba29ae210c4274a31818e344d924542d51df3ffd86dcaaa03aa32e845fe
+  data.tar.gz: b039b0583da4e9d12a2086384a6562855aaaedb9384185d37c9fd25613ba15bd
 SHA512:
-  metadata.gz: fedde92ebaf5bd74f492b6325e18da62da07fe331573a0779a4cc24b9d00127790d094bc6182ddb49e5be4977a62162f863ab7624b327e6048f46b4436b6a1a9
-  data.tar.gz: 6caae59455c31ec32e9ab3a7cc9f4b7b719568ac267790b6de4db0aa0fb6b3f615b75a679031ecf962d2b67c1e00fa07582bfc2ed76b22b7af197bf5ef5ff04e
+  metadata.gz: 33328ffa2944d480aa1281de12bb0ad68d9a04d11e62d4289644308c23a01c699e70597d9d753fe657780907b04078d6f7ff2ec3a951007f53bdf40626d3c55b
+  data.tar.gz: bd06b7c3ba893f0c47a9328c37270d2c62cbe7150464fe3f20241f61c9cfde817e0b65e54221b23baf46065756be205915f502a9926cee49340201e4a44f7a15

data/lib/ood_packaging/build.rb

@@ -284,8 +284,13 @@ class OodPackaging::Build
       'mk-build-deps --install --remove --root-cmd sudo',
       "--tool='#{tool.join(' ')}'"
     ]
+    cleanup = [
+      "#{package}-build-deps*.buildinfo",
+      "#{package}-build-deps*.changes"
+    ]
     Dir.chdir(deb_work_dir) do
       sh "#{cmd.join(' ')}#{cmd_suffix}"
+      sh "rm -f #{cleanup.join(' ')}#{cmd_suffix}"
     end
   end
 

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

@@ -2,7 +2,9 @@ FROM --platform=<%= platform %> <%= base_image %>
 ENV ARCH=<%= arch %> 
 MAINTAINER Trey Dockendorf <tdockendorf@osc.edu>
 ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
 ENV LC_CTYPE=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
 ENV USER=<%= ctr_user %>
 ENV GEM_PATH=<%= ctr_gems_dir %>:
 <% if dist == 'el7' -%>
@@ -33,13 +35,14 @@ RUN dnf install -y --allowerasing systemd ruby nodejs sudo which wget \
 <% elsif dist =~ /^ubuntu|debian/ -%>
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update -y && apt upgrade -y && apt clean all -y
-RUN apt update -y && apt install -y locales && locale-gen $LANG && \
+RUN apt update -y && apt install -y locales && \
+    echo "en_US UTF-8" >> /etc/locale.gen && 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 apt-cudf lintian equivs \
     sudo rake wget curl ruby bundler && \
     apt clean all -y
-<% if arch != 'ppc64le' %>
+<% if ! ['bookworm'].include?(codename) && arch != 'ppc64le' %>
 RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x <%= codename %> main" > /etc/apt/sources.list.d/nodesource.list
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nodesource.gpg
 <% end %>

data/lib/ood_packaging/build_box.rb

@@ -15,12 +15,14 @@ class OodPackaging::BuildBox
     'el9'          => 'almalinux:9',
     'ubuntu-20.04' => 'ubuntu:20.04',
     'ubuntu-22.04' => 'ubuntu:22.04',
+    'debian-12'    => 'debian:12',
     'amzn2023'     => 'amazonlinux:2023'
   }.freeze
 
   CODENAMES = {
     'ubuntu-20.04' => 'focal',
-    'ubuntu-22.04' => 'jammy'
+    'ubuntu-22.04' => 'jammy',
+    'debian-12'    => 'bookworm'
   }.freeze
 
   ARCH_PLATFORMS = {

data/lib/ood_packaging/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.1
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake