ood_packaging 0.22.0 → 0.22.1

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: 6587b5bad61698b2bb1ce049d2a8db3d7c7e8eddeaccf27da0eb7b75d7a5bcf8
4
- data.tar.gz: 7c6e6bbc122bb63962573d59456e2862ca7780121c78c49defcf7896839e3914
3
+ metadata.gz: c51a2fbe9aafffdac24ce60810f83bd8543f5ed67fa9a8a65fa80d1df734d7ad
4
+ data.tar.gz: 604b28d71ce2096bea2c10ee98c92d2df6fa2ad531c9515a2b6b6878967e174d
5
5
  SHA512:
6
- metadata.gz: 64c9f585324b47c3c93d0ecb6a47853797d2f72050bca7c606571e6749000fee278d2d3a2f46074e4b1769b71e5ec5bad55d001b28c240447558b661e4e37ad3
7
- data.tar.gz: ddc021f9a523a2782fd4661e0f4d0451de594e8552cd96c184066773138d4560b52b672e81088231205f751a0f2811830ac72d30ba389871c4b0d2d0ddeef0fa
6
+ metadata.gz: c5bf47ca5110bbb6c0434aa1bde8bf661d3b2dcf14ee037a9aff9ca1369d5c3819443daf41287508b40e58c7c4f6c95a31cc15bdee960d09a4a293188ec522d8
7
+ data.tar.gz: 2a065fa4a4c234d512102e7923f1f8e8f487be14f2c8a5bddd7011dd3014a512e9a046d6e8381e75c3b3101fe3da8c942f32ed1eee2b2b323b8a321af14208cc
@@ -34,8 +34,8 @@ RUN apt update -y && apt install -y apt-transport-https ca-certificates \
34
34
  init debhelper devscripts dh-make build-essential apt-cudf lintian equivs \
35
35
  sudo rake wget curl ruby bundler && \
36
36
  apt clean all -y
37
- RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x nodistro main" > /etc/apt/sources.list.d/nodesource.list
38
- RUN curl -s https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nodesource.gpg
37
+ RUN curl -s https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor > /usr/share/keyrings/nodesource.gpg
38
+ RUN echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_<%= nodejs_version %>.x nodistro main" > /etc/apt/sources.list.d/nodesource.list
39
39
  <% end -%>
40
40
  RUN ln -s /dev/null /etc/systemd/system/proc-sys-fs-binfmt_misc.automount
41
41
  COPY . /build
@@ -35,9 +35,14 @@ header "Creating users"
35
35
  run groupadd <%= ctr_user %>
36
36
  run useradd --home-dir <%= ctr_home %> --create-home --gid <%= ctr_user %> --password '<%= ctr_user %>' <%= ctr_user %>
37
37
 
38
+ if sudo --version | grep sudo-rs ; then
39
+ SUDO_DEFAULTS="!pwfeedback, !use_pty"
40
+ else
41
+ SUDO_DEFAULTS="!requiretty, !authenticate"
42
+ fi
38
43
  header "Add sudo"
39
44
  cat > /etc/sudoers.d/ood <<EOF
40
- Defaults:<%= ctr_user %> !requiretty, !authenticate
45
+ Defaults:<%= ctr_user %> $SUDO_DEFAULTS
41
46
  %<%= ctr_user %> ALL=NOPASSWD:ALL
42
47
  EOF
43
48
  run chmod 440 /etc/sudoers.d/ood
@@ -2,7 +2,7 @@
2
2
 
3
3
  # Version code for OodPackaging
4
4
  module OodPackaging
5
- VERSION = '0.22.0'
5
+ VERSION = '0.22.1'
6
6
  PACKAGE_VERSION = {
7
7
  'ondemand-release' => {
8
8
  '(ubuntu|debian)' => '4.2.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.22.0
4
+ version: 0.22.1
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: 2026-04-14 00:00:00.000000000 Z
12
+ date: 2026-04-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake