A couple of Dockerfile cleanups (#2200)

* Remove already fixed workaround Signed-off-by: David Cassany <[email protected]> * Workaround for boo#1231244 Signed-off-by: David Cassany <[email protected]> --------- Signed-off-by: David Cassany <[email protected]>
rancher · Oct 2, 2024 · 55770a2 · 55770a2
1 parent 3d763bb
commit 55770a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -60,10 +60,6 @@ RUN ARCH=$(uname -m); \
         lvm2 && \
     zypper cc -a
 
-# This a temporary workaround, glibc package got restructured into subpackages and now mtools is not
-# requiring the apropriate package as a dependency (boo#1225982)
-RUN zypper install -y --no-recommends glibc-gconv-modules-extra && zypper cc -a 
-
 # Copy the built CLI
 COPY --from=elemental-bin /usr/bin/elemental /usr/bin/elemental
 

diff --git a/examples/green/Dockerfile b/examples/green/Dockerfile
@@ -75,7 +75,8 @@ COPY --from=toolkit /usr/bin/elemental /usr/bin/elemental
 RUN systemctl enable NetworkManager.service && \
     systemctl enable sshd.service
 
-RUN useradd --system systemd-timesync
+# Workaround to make sure there are no pending sysusers to be created (boo#1231244)
+RUN systemd-sysusers
 
 # This is for automatic testing purposes, do not do this in production.
 RUN echo "PermitRootLogin yes" > /etc/ssh/sshd_config.d/rootlogin.conf