Fixes for podman in build-dockerfile

mlcommons · Dec 29, 2024 · 553c24a · 553c24a
1 parent d1beb68
commit 553c24a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/script/build-dockerfile/_cm.yaml b/script/build-dockerfile/_cm.yaml
@@ -57,6 +57,11 @@ input_mapping:
 new_env_keys:
 - CM_DOCKERFILE_*
 
+deps:
+  - tags: get,docker
+    names:
+    - docker
+
 post_deps:
 - enable_if_env:
     CM_BUILD_DOCKER_IMAGE:

diff --git a/script/build-dockerfile/customize.py b/script/build-dockerfile/customize.py
@@ -250,8 +250,10 @@ def preprocess(i):
     docker_user = get_value(env, config, 'USER', 'CM_DOCKER_USER')
     docker_group = get_value(env, config, 'GROUP', 'CM_DOCKER_GROUP')
 
-    if docker_user and str(env.get('CM_DOCKER_USE_DEFAULT_USER', '')).lower() not in [
-            "yes", "1", "true"]:
+    if env.get('CM_CONTAINER_TOOL', '') == 'podman' and env.get('CM_DOCKER_USE_DEFAULT_USER', '') == '':
+        env['CM_DOCKER_USE_DEFAULT_USER'] = 'yes'
+
+    if docker_user and str(env.get('CM_DOCKER_USE_DEFAULT_USER', '')).lower() not in ["yes", "1", "true"]:
 
         f.write('RUN groupadd -g $GID -o ' + docker_group + EOL)