From c9a4f3459ea560415eb1db8202750eee64426ac7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 29 2022 16:11:08 +0000 Subject: import toolbox-0.0.99.3-0.4.module+el8.6.0+14131+b9baa4cc --- diff --git a/SOURCES/toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch b/SOURCES/toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch new file mode 100644 index 0000000..258226c --- /dev/null +++ b/SOURCES/toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch @@ -0,0 +1,44 @@ +From 6b47ff61936d2b602d29b229b079bda00dadad7e Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Thu, 2 Sep 2021 14:57:37 +0200 +Subject: [PATCH] cmd/root: Suggest a way forward if coreos/toolbox was used + +github.com/coreos/toolbox bind mounts the entire /run from the host +operating system into the toolbox container. Due to this, when run +rootful, the /run/.containerenv created by Podman inside the container +is also seen on the host. This confuses Toolbox into thinking that it's +running inside a container, even when it's running on the host. + +This is an attempt to differentiate between a toolbox container and +the host by looking at the 'container' environment variable, so that +the user can be presented with a more helpful error message. + +https://bugzilla.redhat.com/show_bug.cgi?id=1998191 +--- + src/cmd/root.go | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/cmd/root.go b/src/cmd/root.go +index 5e6f5874a469..139609592218 100644 +--- a/src/cmd/root.go ++++ b/src/cmd/root.go +@@ -130,6 +130,16 @@ func preRun(cmd *cobra.Command, args []string) error { + + if toolboxPath == "" { + if utils.IsInsideContainer() { ++ if containerType := os.Getenv("container"); containerType == "" { ++ var builder strings.Builder ++ fmt.Fprintf(&builder, "/run/.containerenv found on what looks like the host\n") ++ fmt.Fprintf(&builder, "If this is the host, then remove /run/.containerenv and try again.\n") ++ fmt.Fprintf(&builder, "Otherwise, contact your system administrator or file a bug.") ++ ++ errMsg := builder.String() ++ return errors.New(errMsg) ++ } ++ + return errors.New("TOOLBOX_PATH not set") + } + +-- +2.31.1 + diff --git a/SOURCES/toolbox.conf b/SOURCES/toolbox.conf index 8ef3b3a..f934f2b 100644 --- a/SOURCES/toolbox.conf +++ b/SOURCES/toolbox.conf @@ -14,4 +14,4 @@ # If the name does not contain a registry, the local image storage will be # consulted, and if it's not present there then it will be pulled from a # suitable remote registry. -image = "registry.redhat.io/rhel8/support-tools:latest" +image = "registry.access.redhat.com/ubi8/toolbox:latest" diff --git a/SPECS/toolbox.spec b/SPECS/toolbox.spec index e286c6a..429072a 100644 --- a/SPECS/toolbox.spec +++ b/SPECS/toolbox.spec @@ -9,7 +9,7 @@ Version: 0.0.99.3 %global goipath github.com/containers/%{name} %gometa -Release: 0.2%{?dist} +Release: 0.4%{?dist} Summary: Unprivileged development environment License: ASL 2.0 @@ -26,6 +26,7 @@ Source1: %{name}.conf Patch100: toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch Patch101: toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch Patch102: toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch +Patch103: toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1905383 ExcludeArch: %{ix86} @@ -65,6 +66,7 @@ The %{name}-tests package contains system tests for %{name}. %endif %patch102 -p1 +%patch103 -p1 # %%gomkdir is absent from RHEL 8. GOBUILDDIR="$(pwd)/_build" @@ -112,6 +114,14 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf %changelog +* Mon Sep 20 2021 Jindrich Novy - 0.0.99.3-0.4 +- Switch to using the Toolbox-specific UBI image by default +- Related: #2001445 + +* Thu Sep 02 2021 Debarshi Ray - 0.0.99.3-0.3 +- Suggest a way forward if coreos/toolbox was used +Resolves: #1998191, #2000914 + * Thu Aug 26 2021 Jindrich Novy - 0.0.99.3-0.2 - Make sosreport work by setting the HOST environment variable - Related: #1934415