From a943e6598b23206867f07e91df2359a3cb604038 Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Thu, 13 Feb 2025 10:12:08 -0500
Subject: [PATCH] Fix dev container (#4141)

* fix issue with building container WRT sudo requiring a password

* cache layers in podman
---
 Dockerfile.dev           | 2 ++
 lib/tasks/rake_helper.rb | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index 289f800e7..f2e48c9c9 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -21,6 +21,8 @@ RUN dnf -y update && \
     dnf install -y gcc gcc-c++ libyaml-devel nc && \
     dnf clean all && rm -rf /var/cache/dnf/*
 
+RUN chmod 600 /etc/shadow
+
 RUN sed -i 's#^CREATE_MAIL_SPOOL=yes#CREATE_MAIL_SPOOL=no#' /etc/default/useradd; \
     grep $GID /etc/group >/dev/null || groupadd -g $GID $USER; \
     useradd -l -u $UID --create-home --gid $GID $USER && \
diff --git a/lib/tasks/rake_helper.rb b/lib/tasks/rake_helper.rb
index 5c2fe0018..5f7dad670 100644
--- a/lib/tasks/rake_helper.rb
+++ b/lib/tasks/rake_helper.rb
@@ -204,6 +204,7 @@ def image_exists?(image_name)
 
   def buildah_build_cmd(docker_file, image_name, image_tag: ood_image_tag, extra_args: [])
     args = ['bud', '--build-arg', "VERSION=#{ood_version}"]
+    args.concat(['--layers'])
     args.concat ['-t', "#{image_name}:#{image_tag}", '-f', docker_file]
     args.concat extra_args