From 925d2a89cf14af4661cf6f8ee321e1df3ed95b92 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 28 Sep 2023 16:29:56 -0400 Subject: [PATCH] Move container entrypoint to tier 0 --- tier-0/manifest.yaml | 4 ++++ tier-1/user-experience.yaml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tier-0/manifest.yaml b/tier-0/manifest.yaml index f67f0a8..4c79ea0 100644 --- a/tier-0/manifest.yaml +++ b/tier-0/manifest.yaml @@ -18,6 +18,10 @@ etc-group-members: - systemd-journal - adm +# Default to `bash` in our container, the same as other containers we ship. +container-cmd: + - /usr/bin/bash + # Note that the default for c9s+ is sqlite; we can't rely on rpm being # in the target (it isn't in tier-0!) so turn this to host here. This # does break the "hermetic build" aspect a bit. Maybe eventually diff --git a/tier-1/user-experience.yaml b/tier-1/user-experience.yaml index 2118b67..b32d6bc 100644 --- a/tier-1/user-experience.yaml +++ b/tier-1/user-experience.yaml @@ -2,10 +2,6 @@ # https://github.com/openshift/os/blob/71c974b1e456292033e3ef3fe7bcfe17d1855ebc/manifest.yaml#L12 # Only apply changes here that should apply to both FCOS and RHCOS. -# Default to `bash` in our container, the same as other containers we ship. -container-cmd: - - /usr/bin/bash - # These packages are either widely used utilities/services or # are targeted for improving the general CoreOS user experience. # It is intended to be kept generic so that it may be shared downstream with