From 25c279e06aa5f12e673cbe123f07dde7c5c55c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 24 Nov 2023 16:15:51 +0100 Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 toolbox revision 2d27519ae9cb1070e78242b77063b9f6 --- .gitattributes | 23 ++ _service | 14 ++ _servicedata | 6 + ...oos-toolbox-2.3+git20231030.3a6ef35.tar.xz | 3 + toolbox.changes | 206 ++++++++++++++++++ toolbox.spec | 62 ++++++ 6 files changed, 314 insertions(+) create mode 100644 .gitattributes create mode 100644 _service create mode 100644 _servicedata create mode 100644 microos-toolbox-2.3+git20231030.3a6ef35.tar.xz create mode 100644 toolbox.changes create mode 100644 toolbox.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..fecc750 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/_service b/_service new file mode 100644 index 0000000..e51f206 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + 2.3 + 2.3+git%cd.%h + https://github.com/openSUSE/microos-toolbox.git + git + enable + + + xz + *.tar + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..eca7b19 --- /dev/null +++ b/_servicedata @@ -0,0 +1,6 @@ + + + https://github.com/openSUSE/microos-toolbox.git + 3a6ef35d392295752584e7e888c4469b53eed7ee + + \ No newline at end of file diff --git a/microos-toolbox-2.3+git20231030.3a6ef35.tar.xz b/microos-toolbox-2.3+git20231030.3a6ef35.tar.xz new file mode 100644 index 0000000..346e150 --- /dev/null +++ b/microos-toolbox-2.3+git20231030.3a6ef35.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bf347b46144d3e9a3152b5e86225a399e5bc858bf8f12388d79f44506f3119f +size 13328 diff --git a/toolbox.changes b/toolbox.changes new file mode 100644 index 0000000..bbb911c --- /dev/null +++ b/toolbox.changes @@ -0,0 +1,206 @@ +------------------------------------------------------------------- +Mon Oct 30 13:38:45 UTC 2023 - kukuk@suse.com + +- Update to version 2.3+git20231030.3a6ef35: + * Mount /dev/pts as mount type=devpts instead of --volume + * fix typo creat -> create + * Remove trailing whitespace + * Fix bash error when container cannot be pulled + +------------------------------------------------------------------- +Mon May 8 11:01:45 UTC 2023 - Danish Prakash + +- Update EOL *-micro images to supported versions. (bsc#1211018) + +------------------------------------------------------------------- +Tue Jun 28 08:11:34 UTC 2022 - Thorsten Kukuk + +- Prefer podman as container runtime + (unrelated part of [bnc#1200976]) + +------------------------------------------------------------------- +Wed Jun 22 19:48:29 UTC 2022 - kukuk@suse.com + +- Update to version 2.3+git20220622.32785f7: + * Only set --userns=keep-id when running rootless + +------------------------------------------------------------------- +Fri Jun 03 11:13:15 UTC 2022 - kukuk@suse.com + +- Update to version 2.3+git20220603.bbeda2e: + * Allow to choose runtime and try to retain the user's groups + * (Try to) Avoid problems when packages touching bind mounts are upgraded + * Try to make sure that (some) foreign distro images (kind of) work as toolboxes + * Do not stop a toolbox with something running inside + * Exit if neither podman or docker are usable + * Support passing just the name of the container to create and enter command + * Fix cleanup logic and make toolbox start a little less verbose + * Always pull when creating a new toolbox + * Add a "more sandboxing" mode + +------------------------------------------------------------------- +Mon Feb 21 13:16:41 UTC 2022 - jsrain@suse.com + +- adjusted the patch to the toolbox container in registry + +------------------------------------------------------------------- +Wed Jan 26 13:48:14 UTC 2022 - Jan Zerebecki + +- Allow docker as an alternative to podman in the package Requires. This was + supported since 2.2. + +------------------------------------------------------------------- +Mon Jan 17 09:48:54 UTC 2022 - kukuk@suse.com + +- Update to version 2.3+git20220117.bd53c7c: + - Fixes error where if custom image is used toolbox will download + the default image before entering an existing container. (#40) + +------------------------------------------------------------------- +Wed Nov 24 14:43:54 UTC 2021 - kukuk@suse.com + +- Update to version 2.2+git20211124.09791b1: + * Introduce -n/--nostop switch so mutiple sessions can be run inside an existing toolbox + +------------------------------------------------------------------- +Mon Nov 8 15:46:47 UTC 2021 - Ludwig Nussel + +- Don't install config file in /etc in favor of a built-in default. Avoids + empty /etc pulling wrong image. +- Handle Leap Micro (boo#1192474) + +------------------------------------------------------------------- +Mon Aug 23 13:37:09 UTC 2021 - kukuk@suse.com + +- Update to version 2.2+git20210823.dd0fff8: + * README mini-typo + * Docker: don't use unsupported --userns=keep-id + * Docker: also check for created status + * Try to use docker if installed and podman is not + * Properly share namespaces in non-user toolboxes + * Properly quote workdir + +------------------------------------------------------------------- +Mon Mar 29 09:36:19 UTC 2021 - kukuk@suse.com + +- Update to version 2.1+git20210329.d14ac82: + * Fix localtime and mount sys, e.g., for tracing + * Fix 'toolbox list' returning an error code even if working + +------------------------------------------------------------------- +Thu Mar 11 13:49:05 UTC 2021 - kukuk@suse.com + +- Update to version 2.1+git20210311.15cb3ad: + * Don't check for subuid if root calls toolbox [bsc#1183375] + +------------------------------------------------------------------- +Fri Mar 05 16:52:01 UTC 2021 - kukuk@suse.com + +- Update to version 2.1+git20210305.ca2bc53: + * Avoid copying the user setup script with 'podman cp' + +------------------------------------------------------------------- +Fri Feb 26 08:29:43 UTC 2021 - kukuk@suse.com + +- Update to version 2.1+git20210226.daeb191: + * Set trap only after option parsing (#22) + +------------------------------------------------------------------- +Thu Feb 25 15:53:06 UTC 2021 - kukuk@suse.com + +- Update to version 2.1+git20210225.5c541c8: + * Check sub{u,g}id if rootless, and fail early if they're not setup + * Fix creating a container with a specific name with `-c` + +------------------------------------------------------------------- +Mon Feb 08 09:03:18 UTC 2021 - kukuk@suse.com + +- Update to version 2.1+git20210208.a720b25: + * Alleviate the need for zypper in the user toolbox script + * Consolidate logging and help debugging of the user toolbox's script + * Export machine-id and IPC inside the toolbox (IPC, user only) + * Fix (more) formatting... + +------------------------------------------------------------------- +Wed Feb 03 10:33:22 UTC 2021 - kukuk@suse.com + +- Update to version 2.1+git20210203.a669e3a: + * Fix formatting + * Enhance alternate UI docu + * Ignore podman runlabel error if no RUN label exist + * Enhance documentation + * Check existence of volume directories (#15) + +------------------------------------------------------------------- +Mon Jan 25 10:24:32 UTC 2021 - kukuk@suse.com + +- Update to version 2.0+git20210125.50611db: + * Document configuration files, add /usr/etc/toolboxrc + * Update README to include commands + * Update the README + * Be even more compatible with Silverblue Toolbox + * Introduce commands, for compatibility with Silverblue's toolbox + * Mount /run/media and and /tmp inside a user toolbox + * Export more env variables inside (user) toolboxes + +------------------------------------------------------------------- +Wed Jan 20 09:57:44 UTC 2021 - Thorsten Kukuk + +- Add a group tag for SLE Micro +- Mark toolboxrc as %config and add it is Source + +------------------------------------------------------------------- +Tue Jan 19 13:12:13 UTC 2021 - bruno.leon@suse.com + +- Update to version 1.0+git20210119.b5acdcf: + * Dynamically set REGISTRY and IMAGE (#11) + +------------------------------------------------------------------- +Thu Nov 26 10:48:21 UTC 2020 - kukuk@suse.com + +- Update to version 1.0+git20201126.3d26283: + * Make it easier to use custom images (#10) + * Update toolbox doc (#9) + +------------------------------------------------------------------- +Wed Sep 02 16:44:06 UTC 2020 - kukuk@suse.com + +- Update to version 1.0+git20200831.d2d2e5d: + * Allow graphical applications from inside a user toolbox to run + +------------------------------------------------------------------- +Mon Aug 03 12:49:28 UTC 2020 - kukuk@suse.com + +- Update to version 1.0+git20200803.7ff20b6: + * Connect to the host's SSH agent in user toolboxes. + * Stay in current directory, even when entering a toolbox + * Use the toolbox name as the actual toolbox's hostname + +------------------------------------------------------------------- +Wed Mar 25 10:04:19 UTC 2020 - kukuk@suse.com + +- Update to version 1.0+git20200324.dd047bc: + * fix entering a toolbox if something changed in /dev since creation + +------------------------------------------------------------------- +Mon Feb 17 09:07:33 UTC 2020 - kukuk@suse.com + +- Update to version 1.0+git20200217.cd18bfb: + * Multiple toolboxes, with different names + * Configure `sudo` access for an user toolbox + * Correctly setup the user + * Add -u|--user parameter + * Handle arguments with 'getopt' + +------------------------------------------------------------------- +Mon Oct 14 12:40:00 UTC 2019 - kukuk@suse.com + +- Update to version 1.0+git20191014.3034fbc: + * Make default shell configureable, use /bin/bash as default + +------------------------------------------------------------------- +Mon Oct 07 08:31:08 UTC 2019 - kukuk@suse.com + +- Update to version 1.0+git20191007.e038337: + * Initial version + diff --git a/toolbox.spec b/toolbox.spec new file mode 100644 index 0000000..586afa9 --- /dev/null +++ b/toolbox.spec @@ -0,0 +1,62 @@ +# +# spec file for package toolbox +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: toolbox +Version: 2.3+git20231030.3a6ef35 +Release: 0 +Summary: Script to start a toolbox container for system debugging +License: Apache-2.0 +Group: System/Management +URL: https://github.com/openSUSE/microos-toolbox +Source: microos-toolbox-%{version}.tar.xz +Requires: (podman or docker) +Suggests: podman +BuildArch: noarch + +%description +On systems using transactional-update it is not really possible due to +the read-only root filesystem to install tools to analyze problems in the +currently running system, a reboot is always required. Which makes it next +to impossible to debug such problems. toolbox is a small script that launches +a container to let you bring in your favorite debugging or admin tools in +such a system. The root filesystem can be found at /media/root. + +%prep +%setup -q -n microos-toolbox-%{version} +%if 0%{?sle_version} +%if !0%{?is_opensuse} +sed -i -e 's,registry.opensuse.org,registry.suse.com,' toolbox +sed -i -e 's,opensuse/toolbox,suse/sle-micro/5.4/toolbox,' toolbox +%else +sed -i -e 's,opensuse/toolbox,opensuse/leap-micro/5.4/toolbox,' toolbox +%endif +%endif + +%build + +%install +mkdir -p %{buildroot}%{_bindir} +install -m 755 toolbox %{buildroot}%{_bindir}/toolbox + +%files +%license LICENSE +%doc README.md +%{_bindir}/toolbox +%ghost %config %{_sysconfdir}/toolboxrc + +%changelog