From 39faeaff570778250ada93483ab3749e7bb0fab2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Sep 2021 05:06:36 +0000 Subject: [PATCH] import toolbox-0.0.99.3-0.4.module+el8.5.0+12682+a4eeb084 --- ...-a-way-forward-if-coreos-toolbox-was.patch | 44 +++++++++++++++++++ ...report-work-by-setting-the-HOST-envi.patch | 26 +++++++++++ SOURCES/toolbox.conf | 17 +++++++ SPECS/toolbox.spec | 26 ++++++++++- 4 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 SOURCES/toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch create mode 100644 SOURCES/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch create mode 100644 SOURCES/toolbox.conf 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-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch b/SOURCES/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch new file mode 100644 index 0000000..84ae242 --- /dev/null +++ b/SOURCES/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch @@ -0,0 +1,26 @@ +From 786c5065c73703ef46e13905a4672f1b4918310a Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Wed, 18 Aug 2021 17:55:21 +0200 +Subject: [PATCH] cmd/run: Make sosreport work by setting the HOST environment + variable + +https://bugzilla.redhat.com/show_bug.cgi?id=1940037 +--- + src/cmd/run.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/cmd/run.go b/src/cmd/run.go +index e8e96932415e..188f0f2394df 100644 +--- a/src/cmd/run.go ++++ b/src/cmd/run.go +@@ -443,6 +443,7 @@ func constructExecArgs(container string, + execArgs = append(execArgs, detachKeys...) + + execArgs = append(execArgs, []string{ ++ "--env", "HOST=/run/host", + "--interactive", + "--tty", + "--user", currentUser.Username, +-- +2.31.1 + diff --git a/SOURCES/toolbox.conf b/SOURCES/toolbox.conf new file mode 100644 index 0000000..f934f2b --- /dev/null +++ b/SOURCES/toolbox.conf @@ -0,0 +1,17 @@ +[general] +# Create a toolbox container for a different operating system distro than the +# host. Cannot be used with 'image'. +## distro = "fedora" + +# Create a toolbox container for a different operating system release than the +# host. Cannot be used with 'image'. +## release = "33" + +# Change the name of the image used to create the toolbox container. This is +# useful for creating containers from custom-built images. Cannot be used with +# 'distro' or 'release'. +# +# 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.access.redhat.com/ubi8/toolbox:latest" diff --git a/SPECS/toolbox.spec b/SPECS/toolbox.spec index 2eae04b..31f9b30 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: 1%{?dist} +Release: 0.4%{?dist} Summary: Unprivileged development environment License: ASL 2.0 @@ -20,10 +20,13 @@ URL: https://github.com/containers/%{name} # $ cd src # $ go mod vendor Source0: %{name}-%{version}-vendored.tar.xz +Source1: %{name}.conf # RHEL specific 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} @@ -34,6 +37,7 @@ BuildRequires: meson BuildRequires: pkgconfig(bash-completion) BuildRequires: systemd +Requires: containers-common Requires: podman >= 1.4.0 @@ -61,6 +65,9 @@ The %{name}-tests package contains system tests for %{name}. %patch101 -p1 %endif +%patch102 -p1 +%patch103 -p1 + # %%gomkdir is absent from RHEL 8. GOBUILDDIR="$(pwd)/_build" GOSOURCEDIR="$(pwd)" @@ -88,6 +95,7 @@ ln -s src/vendor vendor %install %meson_install +install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf %files @@ -106,6 +114,22 @@ ln -s src/vendor vendor %changelog +* Mon Sep 20 2021 Debarshi Ray - 0.0.99.3-0.4 +- Switch to using the Toolbox-specific UBI image by default +Resolves: #2004562 + +* Thu Sep 02 2021 Debarshi Ray - 0.0.99.3-0.3 +- Suggest a way forward if coreos/toolbox was used +Resolves: #1998191 + +* Thu Aug 26 2021 Jindrich Novy - 0.0.99.3-0.2 +- Make sosreport work by setting the HOST environment variable +- Related: #1934415 + +* Wed Aug 11 2021 Jindrich Novy - 0.0.99.3-0.1 +- change release to 0.x so it is obvious it is devel version +- Related: #1934415 + * Thu Aug 05 2021 Jindrich Novy - 0.0.99.3-1 - Fix the build on CentOS Stream - Related: #1934415