ood_packaging 0.12.1 → 0.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3bd56c23ece9ab15fb8e43934f481e79505c14864198fa1ca99b17b6acf80640
4
- data.tar.gz: 5b92c3a6cdd936faa0136c624f31fec04dad7f94bd70112bdcbecb53521f8fd3
3
+ metadata.gz: 3bbc278058062ebfb69fbcd090aeff96b16f1b2a4bfe0f2aeba9b1e99559d19a
4
+ data.tar.gz: 77a0d0cd87a46086f596e9d13c89c1719ee6c5f4339fcbb37b4645c26bc70966
5
5
  SHA512:
6
- metadata.gz: fedde92ebaf5bd74f492b6325e18da62da07fe331573a0779a4cc24b9d00127790d094bc6182ddb49e5be4977a62162f863ab7624b327e6048f46b4436b6a1a9
7
- data.tar.gz: 6caae59455c31ec32e9ab3a7cc9f4b7b719568ac267790b6de4db0aa0fb6b3f615b75a679031ecf962d2b67c1e00fa07582bfc2ed76b22b7af197bf5ef5ff04e
6
+ metadata.gz: fe2fea7d25e40e6db7e64312bbbaf71485239d846e73d608728106c1b4f7d4ddef4d246473384a7831b362c8887b3468b61d006f660922e9c4f0eb645578c72b
7
+ data.tar.gz: 90d926e3f8dbad788948ef1e128b0a4ea77026e95436e7561734741eb8fc94c49d970c198f41fefd9923b33b0d5c50bfcc064e672ea50fa56e6a1dba758041cf
@@ -284,8 +284,13 @@ class OodPackaging::Build
284
284
  'mk-build-deps --install --remove --root-cmd sudo',
285
285
  "--tool='#{tool.join(' ')}'"
286
286
  ]
287
+ cleanup = [
288
+ "#{package}-build-deps*.buildinfo",
289
+ "#{package}-build-deps*.changes"
290
+ ]
287
291
  Dir.chdir(deb_work_dir) do
288
292
  sh "#{cmd.join(' ')}#{cmd_suffix}"
293
+ sh "rm -f #{cleanup.join(' ')}#{cmd_suffix}"
289
294
  end
290
295
  end
291
296
 
@@ -2,7 +2,9 @@ FROM --platform=<%= platform %> <%= base_image %>
2
2
  ENV ARCH=<%= arch %>
3
3
  MAINTAINER Trey Dockendorf <tdockendorf@osc.edu>
4
4
  ENV LANG=en_US.UTF-8
5
+ ENV LANGUAGE=en_US.UTF-8
5
6
  ENV LC_CTYPE=en_US.UTF-8
7
+ ENV LC_ALL=en_US.UTF-8
6
8
  ENV USER=<%= ctr_user %>
7
9
  ENV GEM_PATH=<%= ctr_gems_dir %>:
8
10
  <% if dist == 'el7' -%>
@@ -33,7 +35,8 @@ RUN dnf install -y --allowerasing systemd ruby nodejs sudo which wget \
33
35
  <% elsif dist =~ /^ubuntu|debian/ -%>
34
36
  ENV DEBIAN_FRONTEND=noninteractive
35
37
  RUN apt update -y && apt upgrade -y && apt clean all -y
36
- RUN apt update -y && apt install -y locales && locale-gen $LANG && \
38
+ RUN apt update -y && apt install -y locales && \
39
+ echo "en_US UTF-8" >> /etc/locale.gen && locale-gen $LANG && \
37
40
  apt clean all -y
38
41
  RUN apt update -y && apt install -y apt-transport-https ca-certificates \
39
42
  init debhelper devscripts dh-make build-essential apt-cudf lintian equivs \
@@ -15,12 +15,14 @@ class OodPackaging::BuildBox
15
15
  'el9' => 'almalinux:9',
16
16
  'ubuntu-20.04' => 'ubuntu:20.04',
17
17
  'ubuntu-22.04' => 'ubuntu:22.04',
18
+ 'debian-12' => 'debian:12',
18
19
  'amzn2023' => 'amazonlinux:2023'
19
20
  }.freeze
20
21
 
21
22
  CODENAMES = {
22
23
  'ubuntu-20.04' => 'focal',
23
- 'ubuntu-22.04' => 'jammy'
24
+ 'ubuntu-22.04' => 'jammy',
25
+ 'debian-12' => 'bookworm'
24
26
  }.freeze
25
27
 
26
28
  ARCH_PLATFORMS = {
@@ -2,7 +2,7 @@
2
2
 
3
3
  # Version code for OodPackaging
4
4
  module OodPackaging
5
- VERSION = '0.12.1'
5
+ VERSION = '0.13.0'
6
6
  PACKAGE_VERSION = {
7
7
  'ondemand-release' => {
8
8
  '(ubuntu|debian)' => '3.1.0',
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ood_packaging
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.1
4
+ version: 0.13.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2023-10-06 00:00:00.000000000 Z
12
+ date: 2023-10-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake