commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2024-07-05 19:45:01
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.2080 (New)
Package is "toolbox"
Fri Jul 5 19:45:01 2024 rev:26 rq:1185366 version:2.3+git20240704.84ec25e
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2023-10-30
22:09:56.950365741 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.2080/toolbox.changes
2024-07-05 19:49:22.942408557 +0200
@@ -1,0 +2,6 @@
+Thu Jul 04 09:45:43 UTC 2024 - ku...@suse.com
+
+- Update to version 2.3+git20240704.84ec25e:
+ * toolbox: use correct container state tense in msg
+
+---
Old:
microos-toolbox-2.3+git20231030.3a6ef35.tar.xz
New:
microos-toolbox-2.3+git20240704.84ec25e.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.zjE4mo/_old 2024-07-05 19:49:23.638434149 +0200
+++ /var/tmp/diff_new_pack.zjE4mo/_new 2024-07-05 19:49:23.642434297 +0200
@@ -1,7 +1,7 @@
#
# spec file for package toolbox
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.3+git20231030.3a6ef35
+Version:2.3+git20240704.84ec25e
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _servicedata ++
--- /var/tmp/diff_new_pack.zjE4mo/_old 2024-07-05 19:49:23.682435767 +0200
+++ /var/tmp/diff_new_pack.zjE4mo/_new 2024-07-05 19:49:23.686435915 +0200
@@ -1,7 +1,7 @@
https://github.com/openSUSE/microos-toolbox.git
-3a6ef35d392295752584e7e888c4469b53eed7ee
+84ec25e7dd2f6c0677c5e91d8de7f9dbc4e9fa19
(No newline at EOF)
++ microos-toolbox-2.3+git20231030.3a6ef35.tar.xz ->
microos-toolbox-2.3+git20240704.84ec25e.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.3+git20231030.3a6ef35/toolbox
new/microos-toolbox-2.3+git20240704.84ec25e/toolbox
--- old/microos-toolbox-2.3+git20231030.3a6ef35/toolbox 2023-10-30
14:37:45.0 +0100
+++ new/microos-toolbox-2.3+git20240704.84ec25e/toolbox 2024-07-04
11:44:56.0 +0200
@@ -47,7 +47,7 @@
}
create() {
-local msg="create"
+local msg="created"
if ! container_exists; then
if ! image_exists || [ -z "$NO_PULL" ]; then
image_pull
@@ -68,7 +68,7 @@
else
echo "Container '$TOOLBOX_NAME' already exists. Trying to start..."
echo "(To remove the container and start with a fresh toolbox, run:
$CLI rm '$TOOLBOX_NAME')"
-msg="start"
+msg="started"
fi
local state
@@ -115,7 +115,7 @@
${SUDO} $CLI exec --user root "${TOOLBOX_NAME}" rm "${tmp_user_setup}"
fi
-echo "Container ${msg}ed."
+echo "Container ${msg}."
}
run() {
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2023-10-30 22:09:54
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.17445 (New)
Package is "toolbox"
Mon Oct 30 22:09:54 2023 rev:25 rq:1121193 version:2.3+git20231030.3a6ef35
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2023-05-09
13:08:09.809315832 +0200
+++ /work/SRC/openSUSE:Factory/.toolbox.new.17445/toolbox.changes
2023-10-30 22:09:56.950365741 +0100
@@ -1,0 +2,9 @@
+Mon Oct 30 13:38:45 UTC 2023 - ku...@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
+
+---
Old:
microos-toolbox-2.3+git20220622.32785f7.tar.xz
New:
microos-toolbox-2.3+git20231030.3a6ef35.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.Aj14T6/_old 2023-10-30 22:09:57.670392304 +0100
+++ /var/tmp/diff_new_pack.Aj14T6/_new 2023-10-30 22:09:57.670392304 +0100
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.3+git20220622.32785f7
+Version:2.3+git20231030.3a6ef35
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _servicedata ++
--- /var/tmp/diff_new_pack.Aj14T6/_old 2023-10-30 22:09:57.710393779 +0100
+++ /var/tmp/diff_new_pack.Aj14T6/_new 2023-10-30 22:09:57.714393927 +0100
@@ -1,7 +1,7 @@
https://github.com/openSUSE/microos-toolbox.git
-32785f726a359255748f24ad1dd61fc3651453ef
+3a6ef35d392295752584e7e888c4469b53eed7ee
(No newline at EOF)
++ microos-toolbox-2.3+git20220622.32785f7.tar.xz ->
microos-toolbox-2.3+git20231030.3a6ef35.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.3+git20220622.32785f7/toolbox
new/microos-toolbox-2.3+git20231030.3a6ef35/toolbox
--- old/microos-toolbox-2.3+git20220622.32785f7/toolbox 2022-06-22
21:47:42.0 +0200
+++ new/microos-toolbox-2.3+git20231030.3a6ef35/toolbox 2023-10-30
14:37:45.0 +0100
@@ -47,14 +47,14 @@
}
create() {
-local msg="creat"
+local msg="create"
if ! container_exists; then
if ! image_exists || [ -z "$NO_PULL" ]; then
image_pull
fi
local runlabel
runlabel=$(image_runlabel) ||:
-
+
echo "Spawning a container '$TOOLBOX_NAME' with image '$TOOLBOX_IMAGE'"
if [[ -z "$runlabel" ]]; then
container_create
@@ -126,7 +126,8 @@
}
cleanup() {
-if [ $(container_active) -eq 0 ] && [ -z "$NO_STOP" ]; then
+active="$(container_active)"
+if [ $active != "" ] && [ $active -eq 0 ] && [ -z "$NO_STOP" ]; then
${SUDO} $CLI stop "$TOOLBOX_NAME" &>/dev/null
fi
}
@@ -194,7 +195,7 @@
container_create() {
if [ -z "$SANDBOX" ]; then
# this is the default behavior, unless --sandbox is specified
-CREATE_NO_SANDBOX="--volume /dev:/dev:rslave --volume /sys:/sys:rslave
--volume /:/media/root:rslave"
+CREATE_NO_SANDBOX="--mount type=devpts,destination=/dev/pts,uid=$(id
-u) --volume /sys:/sys:rslave --volume /:/media/root:rslave"
CREATE_NO_SANDBOX="$CREATE_NO_SANDBOX --privileged --security-opt
label=disable --pid host --ipc host"
fi
if ! ${SUDO} $CLI create \
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2023-05-09 13:08:01
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.1533 (New)
Package is "toolbox"
Tue May 9 13:08:01 2023 rev:24 rq:1085507 version:2.3+git20220622.32785f7
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2022-06-29
16:00:30.788549454 +0200
+++ /work/SRC/openSUSE:Factory/.toolbox.new.1533/toolbox.changes
2023-05-09 13:08:09.809315832 +0200
@@ -1,0 +2,5 @@
+Mon May 8 11:01:45 UTC 2023 - Danish Prakash
+
+- Update EOL *-micro images to supported versions. (bsc#1211018)
+
+---
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.uLn8YG/_old 2023-05-09 13:08:10.369319165 +0200
+++ /var/tmp/diff_new_pack.uLn8YG/_new 2023-05-09 13:08:10.373319189 +0200
@@ -1,7 +1,7 @@
#
# spec file for package toolbox
#
-# Copyright (c) 2022 SUSE LLC
+# 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
@@ -41,9 +41,9 @@
%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.2/toolbox,' 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.2/toolbox,' toolbox
+sed -i -e 's,opensuse/toolbox,opensuse/leap-micro/5.4/toolbox,' toolbox
%endif
%endif
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2022-06-29 16:00:27
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.1548 (New)
Package is "toolbox"
Wed Jun 29 16:00:27 2022 rev:23 rq:985466 version:2.3+git20220622.32785f7
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2022-06-24
08:45:06.507125594 +0200
+++ /work/SRC/openSUSE:Factory/.toolbox.new.1548/toolbox.changes
2022-06-29 16:00:30.788549454 +0200
@@ -1,0 +2,6 @@
+Tue Jun 28 08:11:34 UTC 2022 - Thorsten Kukuk
+
+- Prefer podman as container runtime
+ (unrelated part of [bnc#1200976])
+
+---
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.LgErV7/_old 2022-06-29 16:00:32.764552430 +0200
+++ /var/tmp/diff_new_pack.LgErV7/_new 2022-06-29 16:00:32.768552436 +0200
@@ -25,6 +25,7 @@
URL:https://github.com/openSUSE/microos-toolbox
Source: microos-toolbox-%{version}.tar.xz
Requires: (podman or docker)
+Suggests: podman
BuildArch: noarch
%description
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2022-06-24 08:44:58
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.1548 (New)
Package is "toolbox"
Fri Jun 24 08:44:58 2022 rev:22 rq:984598 version:2.3+git20220622.32785f7
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2022-06-04
23:26:47.856741363 +0200
+++ /work/SRC/openSUSE:Factory/.toolbox.new.1548/toolbox.changes
2022-06-24 08:45:06.507125594 +0200
@@ -1,0 +2,6 @@
+Wed Jun 22 19:48:29 UTC 2022 - ku...@suse.com
+
+- Update to version 2.3+git20220622.32785f7:
+ * Only set --userns=keep-id when running rootless
+
+---
Old:
microos-toolbox-2.3+git20220603.bbeda2e.tar.xz
New:
microos-toolbox-2.3+git20220622.32785f7.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.m37tAw/_old 2022-06-24 08:45:07.127126289 +0200
+++ /var/tmp/diff_new_pack.m37tAw/_new 2022-06-24 08:45:07.135126298 +0200
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.3+git20220603.bbeda2e
+Version:2.3+git20220622.32785f7
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _servicedata ++
--- /var/tmp/diff_new_pack.m37tAw/_old 2022-06-24 08:45:07.207126379 +0200
+++ /var/tmp/diff_new_pack.m37tAw/_new 2022-06-24 08:45:07.211126383 +0200
@@ -1,7 +1,7 @@
https://github.com/openSUSE/microos-toolbox.git
-bbeda2e96bcd8dcf18a3b107ab7a3e868d56a74b
+32785f726a359255748f24ad1dd61fc3651453ef
(No newline at EOF)
++ microos-toolbox-2.3+git20220603.bbeda2e.tar.xz ->
microos-toolbox-2.3+git20220622.32785f7.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.3+git20220603.bbeda2e/toolbox
new/microos-toolbox-2.3+git20220622.32785f7/toolbox
--- old/microos-toolbox-2.3+git20220603.bbeda2e/toolbox 2022-06-03
13:05:18.0 +0200
+++ new/microos-toolbox-2.3+git20220622.32785f7/toolbox 2022-06-22
21:47:42.0 +0200
@@ -448,13 +448,15 @@
test -d "${HOME}" && VOLUMES="$VOLUMES --volume ${HOME}:${HOME}"
test -d "/run/user/${USER_ID}" && VOLUMES="$VOLUMES --volume
/run/user/${USER_ID}:/run/user/${USER_ID}:rslave"
test -d /run/media && VOLUMES="$VOLUMES --volume
/run/media/:/run/media/:rslave"
-if [[ "$CLI" == "podman" ]]; then
-CREATE_AS_USER="--userns=keep-id --user root:root $VOLUMES"
+CREATE_AS_USER="--user root:root $VOLUMES"
+ if [[ "$CLI" == "podman" ]]; then
# Let's retain the user's groupd. This will (probably) only work
# with some runtime, but it's harmless for other, so worth a try.
-CREATE_AS_USER=" $CREATE_AS_USER --annotation
run.oci.keep_original_groups=1"
-elif [[ "$CLI" == "docker" ]]; then
-CREATE_AS_USER="--user root:root $VOLUMES"
+CREATE_AS_USER="$CREATE_AS_USER --annotation
run.oci.keep_original_groups=1"
+ # userns=keep-id only works if being used rootless
+if [[ -z $SUDO ]]; then
+CREATE_AS_USER="$CREATE_AS_USER --userns=keep-id"
+fi
fi
for ENV in $USER_ENV ; do
eval VAL="$""$ENV"
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2022-06-04 23:26:46
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.1548 (New)
Package is "toolbox"
Sat Jun 4 23:26:46 2022 rev:21 rq:980625 version:2.3+git20220603.bbeda2e
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2022-03-20
20:55:09.666493010 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.1548/toolbox.changes
2022-06-04 23:26:47.856741363 +0200
@@ -1,0 +2,14 @@
+Fri Jun 03 11:13:15 UTC 2022 - ku...@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
+
+---
Old:
microos-toolbox-2.3+git20220117.bd53c7c.tar.xz
New:
microos-toolbox-2.3+git20220603.bbeda2e.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.IKqqhC/_old 2022-06-04 23:26:48.332741846 +0200
+++ /var/tmp/diff_new_pack.IKqqhC/_new 2022-06-04 23:26:48.332741846 +0200
@@ -17,12 +17,12 @@
Name: toolbox
-Version:2.3+git20220117.bd53c7c
+Version:2.3+git20220603.bbeda2e
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
Group: System/Management
-URL:https://github.com/thkukuk/microos-toolbox
+URL:https://github.com/openSUSE/microos-toolbox
Source: microos-toolbox-%{version}.tar.xz
Requires: (podman or docker)
BuildArch: noarch
++ _service ++
--- /var/tmp/diff_new_pack.IKqqhC/_old 2022-06-04 23:26:48.360741874 +0200
+++ /var/tmp/diff_new_pack.IKqqhC/_new 2022-06-04 23:26:48.364741878 +0200
@@ -2,7 +2,7 @@
2.3
2.3+git%cd.%h
-git://github.com/kubic-project/microos-toolbox.git
+https://github.com/openSUSE/microos-toolbox.git
git
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.IKqqhC/_old 2022-06-04 23:26:48.380741894 +0200
+++ /var/tmp/diff_new_pack.IKqqhC/_new 2022-06-04 23:26:48.384741898 +0200
@@ -1,7 +1,7 @@
-git://github.com/kubic-project/microos-toolbox.git
-bd53c7cb8a7ac4e0edd8e11b28b2de10d30f7308
+https://github.com/openSUSE/microos-toolbox.git
+bbeda2e96bcd8dcf18a3b107ab7a3e868d56a74b
(No newline at EOF)
++ microos-toolbox-2.3+git20220117.bd53c7c.tar.xz ->
microos-toolbox-2.3+git20220603.bbeda2e.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.3+git20220117.bd53c7c/toolbox
new/microos-toolbox-2.3+git20220603.bbeda2e/toolbox
--- old/microos-toolbox-2.3+git20220117.bd53c7c/toolbox 2022-01-17
10:46:19.0 +0100
+++ new/microos-toolbox-2.3+git20220603.bbeda2e/toolbox 2022-06-03
13:05:18.0 +0200
@@ -24,9 +24,12 @@
TOOLBOX_SHELL="/bin/bash"
SUDO=
-CLI=podman
-if [[ ! -f /usr/bin/podman ]] && [[ -f /usr/bin/docker ]]; then
+if command -v podman &> /dev/null ; then
+CLI=podman
+elif command -v docker &> /dev/null ; then
CLI=docker
+else
+echo "$0: ERROR: neither 'podman' nor 'docker' are available. Exiting!"
fi
test -f /usr/etc/toolboxrc && . /usr/etc/toolboxrc
@@ -34,26 +37,6 @@
MODE="system"
-USER_ENV="DBUS_SESSION_BUS_ADDRESS \
-DBUS_SYSTEM_BUS_ADDRESS \
-DESKTOP_SESSION \
-SESSION_MANAGER \
-DISPLAY \
-LANG \
-SSH_AUTH_SOCK \
-USER \
-USERNAME \
-WAYLAND_DISPLAY \
-XAUTHORITY \
-XAUTHLOCALHOSTNAME \
-XDG_CURRENT_DESKTOP \
-XDG_DATA_DIRS \
-XDG_MENU_PREFIX \
-XDG_RUNTIME_DIR \
-XDG_SESSION_CLASS \
-XDG_SESSION_DESKTOP \
-XDG_SESSION_TYPE"
-
setup() {
# Allow user overrides
if [ -f "${TOOLBOXRC}" ]; then
@@ -66,7 +49,7 @@
create() {
local msg="creat"
if ! container_exists; then
-if ! image_exists; then
+if ! image_exists || [ -z "$NO_PULL" ]; then
image_pull
fi
local runlabel
@@ -111,9 +94,22 @@
groupadd -g ${USER_GID} ${USER_GNAME}
useradd -M -N -g ${USER_GNAME} -u ${USER_ID} ${USER_NAME}
if ! command -v
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2022-03-20 20:55:04
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.25692 (New)
Package is "toolbox"
Sun Mar 20 20:55:04 2022 rev:20 rq:962737 version:2.3+git20220117.bd53c7c
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2022-01-27
23:16:54.575001926 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.25692/toolbox.changes
2022-03-20 20:55:09.666493010 +0100
@@ -1,0 +2,5 @@
+Mon Feb 21 13:16:41 UTC 2022 - jsr...@suse.com
+
+- adjusted the patch to the toolbox container in registry
+
+---
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.8uaNYG/_old 2022-03-20 20:55:10.274493885 +0100
+++ /var/tmp/diff_new_pack.8uaNYG/_new 2022-03-20 20:55:10.282493896 +0100
@@ -40,9 +40,9 @@
%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.1/toolbox,' toolbox
+sed -i -e 's,opensuse/toolbox,suse/sle-micro/5.2/toolbox,' toolbox
%else
-sed -i -e 's,opensuse/toolbox,opensuse/leap-micro/5.1/toolbox,' toolbox
+sed -i -e 's,opensuse/toolbox,opensuse/leap-micro/5.2/toolbox,' toolbox
%endif
%endif
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2022-01-27 23:16:32
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.1898 (New)
Package is "toolbox"
Thu Jan 27 23:16:32 2022 rev:19 rq:949282 version:2.3+git20220117.bd53c7c
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2022-01-20
00:12:32.474589176 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.1898/toolbox.changes
2022-01-27 23:16:54.575001926 +0100
@@ -1,0 +2,6 @@
+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.
+
+---
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.mEIGdc/_old 2022-01-27 23:16:55.070998499 +0100
+++ /var/tmp/diff_new_pack.mEIGdc/_new 2022-01-27 23:16:55.074998471 +0100
@@ -24,7 +24,7 @@
Group: System/Management
URL:https://github.com/thkukuk/microos-toolbox
Source: microos-toolbox-%{version}.tar.xz
-Requires: podman
+Requires: (podman or docker)
BuildArch: noarch
%description
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2022-01-20 00:12:00
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.1892 (New)
Package is "toolbox"
Thu Jan 20 00:12:00 2022 rev:18 rq:946923 version:2.3+git20220117.bd53c7c
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-11-27
00:51:32.522756973 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.1892/toolbox.changes
2022-01-20 00:12:32.474589176 +0100
@@ -1,0 +2,7 @@
+Mon Jan 17 09:48:54 UTC 2022 - ku...@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)
+
+---
Old:
microos-toolbox-2.2+git20211124.09791b1.tar.xz
New:
microos-toolbox-2.3+git20220117.bd53c7c.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.qxu5sE/_old 2022-01-20 00:12:33.062589651 +0100
+++ /var/tmp/diff_new_pack.qxu5sE/_new 2022-01-20 00:12:33.066589653 +0100
@@ -1,7 +1,7 @@
#
# spec file for package toolbox
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.2+git20211124.09791b1
+Version:2.3+git20220117.bd53c7c
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.qxu5sE/_old 2022-01-20 00:12:33.134589709 +0100
+++ /var/tmp/diff_new_pack.qxu5sE/_new 2022-01-20 00:12:33.138589712 +0100
@@ -1,7 +1,7 @@
-2.2
-2.2+git%cd.%h
+2.3
+2.3+git%cd.%h
git://github.com/kubic-project/microos-toolbox.git
git
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.qxu5sE/_old 2022-01-20 00:12:33.170589738 +0100
+++ /var/tmp/diff_new_pack.qxu5sE/_new 2022-01-20 00:12:33.178589744 +0100
@@ -1,7 +1,7 @@
git://github.com/kubic-project/microos-toolbox.git
-70d47d0be3c46a0c903d98950a80abf5c771d416
+bd53c7cb8a7ac4e0edd8e11b28b2de10d30f7308
(No newline at EOF)
++ microos-toolbox-2.2+git20211124.09791b1.tar.xz ->
microos-toolbox-2.3+git20220117.bd53c7c.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.2+git20211124.09791b1/toolbox
new/microos-toolbox-2.3+git20220117.bd53c7c/toolbox
--- old/microos-toolbox-2.2+git20211124.09791b1/toolbox 2021-11-24
15:37:02.0 +0100
+++ new/microos-toolbox-2.3+git20220117.bd53c7c/toolbox 2022-01-17
10:46:19.0 +0100
@@ -64,14 +64,14 @@
}
create() {
-if ! image_exists; then
-image_pull
-fi
-
local msg="creat"
-local runlabel
-runlabel=$(image_runlabel) ||:
if ! container_exists; then
+if ! image_exists; then
+image_pull
+fi
+local runlabel
+runlabel=$(image_runlabel) ||:
+
echo "Spawning a container '$TOOLBOX_NAME' with image '$TOOLBOX_IMAGE'"
if [[ -z "$runlabel" ]]; then
container_create
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2021-11-27 00:50:49
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.1895 (New)
Package is "toolbox"
Sat Nov 27 00:50:49 2021 rev:17 rq:933488 version:2.2+git20211124.09791b1
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-11-18
10:33:23.247882493 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.1895/toolbox.changes
2021-11-27 00:51:32.522756973 +0100
@@ -1,0 +2,6 @@
+Wed Nov 24 14:43:54 UTC 2021 - ku...@suse.com
+
+- Update to version 2.2+git20211124.09791b1:
+ * Introduce -n/--nostop switch so mutiple sessions can be run inside an
existing toolbox
+
+---
Old:
microos-toolbox-2.2+git20210823.dd0fff8.tar.xz
New:
microos-toolbox-2.2+git20211124.09791b1.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.1idjbr/_old 2021-11-27 00:51:33.098754984 +0100
+++ /var/tmp/diff_new_pack.1idjbr/_new 2021-11-27 00:51:33.102754970 +0100
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.2+git20210823.dd0fff8
+Version:2.2+git20211124.09791b1
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _servicedata ++
--- /var/tmp/diff_new_pack.1idjbr/_old 2021-11-27 00:51:33.134754860 +0100
+++ /var/tmp/diff_new_pack.1idjbr/_new 2021-11-27 00:51:33.134754860 +0100
@@ -1,6 +1,6 @@
git://github.com/kubic-project/microos-toolbox.git
-dd0fff8bf7a8462a22d93eedc14ae2bcc84b8b23
+70d47d0be3c46a0c903d98950a80abf5c771d416
\ No newline at end of file
++ microos-toolbox-2.2+git20210823.dd0fff8.tar.xz ->
microos-toolbox-2.2+git20211124.09791b1.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.2+git20210823.dd0fff8/README.md
new/microos-toolbox-2.2+git20211124.09791b1/README.md
--- old/microos-toolbox-2.2+git20210823.dd0fff8/README.md 2021-08-23
14:53:05.0 +0200
+++ new/microos-toolbox-2.2+git20211124.09791b1/README.md 2021-11-24
15:37:02.0 +0100
@@ -10,6 +10,7 @@
The following options are available in `toolbox`:
* `-h` or `--help`: Shows the help message
* `-u` or `--user`: Run as the current user inside the container
+* `-n` or `--nostop`: Do not stop container on exit, allowing multiple
sessions to the same toolbox
* `-R` or `--reg` ``: Explicitly specify the registry to use
* `-I` or `--img` ``: Explicitly specify the image to pull
* `-i` or `--image` ``: Full URI of the image to pull (alternative to
`-R` & `-I`)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.2+git20210823.dd0fff8/toolbox
new/microos-toolbox-2.2+git20211124.09791b1/toolbox
--- old/microos-toolbox-2.2+git20210823.dd0fff8/toolbox 2021-08-23
14:53:05.0 +0200
+++ new/microos-toolbox-2.2+git20211124.09791b1/toolbox 2021-11-24
15:37:02.0 +0100
@@ -130,7 +130,10 @@
}
cleanup() {
-${SUDO} $CLI stop "$TOOLBOX_NAME" &>/dev/null
+if [ -z "$NO_STOP" ]; then
+ ${SUDO} $CLI stop "$TOOLBOX_NAME" &>/dev/null
+fi
+
${SUDO} rm -f $tmp_user_setup
}
@@ -215,7 +218,7 @@
}
show_help() {
-echo "USAGE: toolbox [[-h/--help] | [command] [-r/--root] [-u/--user]
+echo "USAGE: toolbox [[-h/--help] | [command] [-r/--root] [-u/--user]
[-n/--nostop]
[[-R/--reg ] [-I/--img ]|[-i/--image ]]
[[-t/--tag ]|[-c/--container ]] [command_to_run]]
toolbox is a small script that launches a container to let you bring in your
favorite debugging or admin tools.
@@ -232,6 +235,8 @@
-h/--help: Shows this help message
-u/--user: Run as the current user inside the container
-r/--root: Runs $CLI via sudo as root
+ -n/--nostop: Does not stop the container on exit, allowing multiple
+ sessions to use the same toolbox at once
-t/--tag : Add to the toolbox name
-c/--container : Set the name of the toolbox to be equal to
(use this alternatively to -t)
@@ -284,7 +289,7 @@
esac
fi
-ARGS=$(getopt -o hrut:R:I:c:i: --long
help,root,user,tag:,reg:,img:,container:,image: -n toolbox -- "$@")
+ARGS=$(getopt -o hrunt:R:I:c:i: --long
help,root,user,nostop,tag:,reg:,img:,container:,image: -n toolbox -- "$@")
eval set -- "$ARGS"
while true; do
case "$1" in
@@ -301,6 +306,10 @@
shift
MODE="user"
;;
+
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2021-11-18 10:33:06
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.1895 (New)
Package is "toolbox"
Thu Nov 18 10:33:06 2021 rev:16 rq:931744 version:2.2+git20210823.dd0fff8
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-08-25
20:57:13.765238292 +0200
+++ /work/SRC/openSUSE:Factory/.toolbox.new.1895/toolbox.changes
2021-11-18 10:33:23.247882493 +0100
@@ -1,0 +2,7 @@
+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)
+
+---
Old:
toolboxrc.sle-micro
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.Lvfz8m/_old 2021-11-18 10:33:24.099883286 +0100
+++ /var/tmp/diff_new_pack.Lvfz8m/_new 2021-11-18 10:33:24.099883286 +0100
@@ -24,7 +24,6 @@
Group: System/Management
URL:https://github.com/thkukuk/microos-toolbox
Source: microos-toolbox-%{version}.tar.xz
-Source1:toolboxrc.sle-micro
Requires: podman
BuildArch: noarch
@@ -38,23 +37,25 @@
%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.1/toolbox,' toolbox
+%else
+sed -i -e 's,opensuse/toolbox,opensuse/leap-micro/5.1/toolbox,' toolbox
+%endif
+%endif
%build
%install
mkdir -p %{buildroot}%{_bindir}
install -m 755 toolbox %{buildroot}%{_bindir}/toolbox
-%if !0%{?is_opensuse}
-mkdir -p %{buildroot}%{_sysconfdir}
-install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/toolboxrc
-%endif
%files
%license LICENSE
%doc README.md
%{_bindir}/toolbox
-%if !0%{?is_opensuse}
-%config %{_sysconfdir}/toolboxrc
-%endif
+%ghost %config %{_sysconfdir}/toolboxrc
%changelog
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2021-08-25 20:56:33
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.1899 (New)
Package is "toolbox"
Wed Aug 25 20:56:33 2021 rev:15 rq:913783 version:2.2+git20210823.dd0fff8
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-04-10
15:26:47.554337184 +0200
+++ /work/SRC/openSUSE:Factory/.toolbox.new.1899/toolbox.changes
2021-08-25 20:57:13.765238292 +0200
@@ -1,0 +2,11 @@
+Mon Aug 23 13:37:09 UTC 2021 - ku...@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
+
+---
Old:
microos-toolbox-2.1+git20210329.d14ac82.tar.xz
New:
microos-toolbox-2.2+git20210823.dd0fff8.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.X23JVj/_old 2021-08-25 20:57:14.273237624 +0200
+++ /var/tmp/diff_new_pack.X23JVj/_new 2021-08-25 20:57:14.277237619 +0200
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.1+git20210329.d14ac82
+Version:2.2+git20210823.dd0fff8
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.X23JVj/_old 2021-08-25 20:57:14.309237577 +0200
+++ /var/tmp/diff_new_pack.X23JVj/_new 2021-08-25 20:57:14.309237577 +0200
@@ -1,7 +1,7 @@
-2.1
-2.1+git%cd.%h
+2.2
+2.2+git%cd.%h
git://github.com/kubic-project/microos-toolbox.git
git
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.X23JVj/_old 2021-08-25 20:57:14.325237556 +0200
+++ /var/tmp/diff_new_pack.X23JVj/_new 2021-08-25 20:57:14.329237551 +0200
@@ -1,6 +1,6 @@
git://github.com/kubic-project/microos-toolbox.git
-02495cfc046e00ca08e8642bf807423257edafc6
+dd0fff8bf7a8462a22d93eedc14ae2bcc84b8b23
\ No newline at end of file
++ microos-toolbox-2.1+git20210329.d14ac82.tar.xz ->
microos-toolbox-2.2+git20210823.dd0fff8.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.1+git20210329.d14ac82/README.md
new/microos-toolbox-2.2+git20210823.dd0fff8/README.md
--- old/microos-toolbox-2.1+git20210329.d14ac82/README.md 2021-03-29
11:34:23.0 +0200
+++ new/microos-toolbox-2.2+git20210823.dd0fff8/README.md 2021-08-23
14:53:05.0 +0200
@@ -7,7 +7,7 @@
## Usage
-The following options are avialbe in `toolbox`:
+The following options are available in `toolbox`:
* `-h` or `--help`: Shows the help message
* `-u` or `--user`: Run as the current user inside the container
* `-R` or `--reg` ``: Explicitly specify the registry to use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.1+git20210329.d14ac82/toolbox
new/microos-toolbox-2.2+git20210823.dd0fff8/toolbox
--- old/microos-toolbox-2.1+git20210329.d14ac82/toolbox 2021-03-29
11:34:23.0 +0200
+++ new/microos-toolbox-2.2+git20210823.dd0fff8/toolbox 2021-08-23
14:53:05.0 +0200
@@ -24,6 +24,11 @@
TOOLBOX_SHELL="/bin/bash"
SUDO=
+CLI=podman
+if [[ ! -f /usr/bin/podman ]] && [[ -f /usr/bin/docker ]]; then
+CLI=docker
+fi
+
test -f /usr/etc/toolboxrc && . /usr/etc/toolboxrc
test -f /etc/toolboxrc && . /etc/toolboxrc
@@ -79,13 +84,13 @@
[[ -n "${CREATE_AS_USER}" ]] && SETUP_USER=true
else
echo "Container '$TOOLBOX_NAME' already exists. Trying to start..."
-echo "(To remove the container and start with a fresh toolbox, run:
podman rm '$TOOLBOX_NAME')"
+echo "(To remove the container and start with a fresh toolbox, run:
$CLI rm '$TOOLBOX_NAME')"
msg="start"
fi
local state
state=$(container_state)
-if [[ "$state" == configured ]] || [[ "$state" == exited ]] || [[ "$state"
== stopped ]]; then
+if [[ "$state" == configured ]] || [[ "$state" == exited ]] || [[ "$state"
== stopped ]] || [[ "$state" == created ]]; then
container_start
elif [[ "$state" != running ]]; then
echo "Container '$TOOLBOX_NAME' in unknown state: '$state'"
@@ -110,8 +115,8 @@
fi
mkdir -p /etc/sudoers.d/ && echo "${USER_NAME} ALL = (root) NOPASSWD:ALL" >
/etc/sudoers.d/${USER_NAME}
EOF
-${SUDO} podman exec --user root
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2021-04-10 15:26:21
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.2401 (New)
Package is "toolbox"
Sat Apr 10 15:26:21 2021 rev:14 rq:881827 version:2.1+git20210329.d14ac82
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-03-24
16:09:09.739700372 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.2401/toolbox.changes
2021-04-10 15:26:47.554337184 +0200
@@ -1,0 +2,7 @@
+Mon Mar 29 09:36:19 UTC 2021 - ku...@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
+
+---
Old:
microos-toolbox-2.1+git20210311.15cb3ad.tar.xz
New:
microos-toolbox-2.1+git20210329.d14ac82.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.h6WUfl/_old 2021-04-10 15:26:48.246337998 +0200
+++ /var/tmp/diff_new_pack.h6WUfl/_new 2021-04-10 15:26:48.250338003 +0200
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.1+git20210311.15cb3ad
+Version:2.1+git20210329.d14ac82
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _servicedata ++
--- /var/tmp/diff_new_pack.h6WUfl/_old 2021-04-10 15:26:48.282338041 +0200
+++ /var/tmp/diff_new_pack.h6WUfl/_new 2021-04-10 15:26:48.282338041 +0200
@@ -1,6 +1,6 @@
git://github.com/kubic-project/microos-toolbox.git
-15cb3adef516e0167737a407734c03e48ac4cf1a
+02495cfc046e00ca08e8642bf807423257edafc6
\ No newline at end of file
++ microos-toolbox-2.1+git20210311.15cb3ad.tar.xz ->
microos-toolbox-2.1+git20210329.d14ac82.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.1+git20210311.15cb3ad/toolbox
new/microos-toolbox-2.1+git20210329.d14ac82/toolbox
--- old/microos-toolbox-2.1+git20210311.15cb3ad/toolbox 2021-03-11
14:46:14.0 +0100
+++ new/microos-toolbox-2.1+git20210329.d14ac82/toolbox 2021-03-29
11:34:23.0 +0200
@@ -162,6 +162,7 @@
list() {
${SUDO} podman ps --all
+exit $?
}
container_create() {
@@ -173,7 +174,9 @@
--security-opt label=disable ${CREATE_AS_USER} \
--volume /:/media/root:rslave \
--volume /dev:/dev:rslave \
+ --volume /sys:/sys:rslave \
--volume /etc/machine-id:/etc/machine-id:ro \
+ --volume /etc/localtime:/etc/localtime:ro \
"$TOOLBOX_IMAGE" sleep +Inf 2>&1; then
echo "$0: failed to create container '$TOOLBOX_NAME'"
exit 1
@@ -335,6 +338,12 @@
esac
done
+# Handle list before setting up the cleanup trap, as we won't need
+# to try to stop the container, in that case
+if [ "$COMMAND" == "list" ]; then
+list
+fi
+
# Don't call trap before, else we will cleanup stuff
# where nothing is to cleanup and report wrong error
trap cleanup EXIT
@@ -370,9 +379,6 @@
fi
case $COMMAND in
-list)
-list
-;;
create)
create
;;
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2021-03-24 16:09:04
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.2401 (New)
Package is "toolbox"
Wed Mar 24 16:09:04 2021 rev:13 rq:879899 version:2.1+git20210311.15cb3ad
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-03-10
08:52:00.590564125 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.2401/toolbox.changes
2021-03-24 16:09:09.739700372 +0100
@@ -1,0 +2,6 @@
+Thu Mar 11 13:49:05 UTC 2021 - ku...@suse.com
+
+- Update to version 2.1+git20210311.15cb3ad:
+ * Don't check for subuid if root calls toolbox [bsc#1183375]
+
+---
Old:
microos-toolbox-2.1+git20210305.ca2bc53.tar.xz
New:
microos-toolbox-2.1+git20210311.15cb3ad.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.rZjCW1/_old 2021-03-24 16:09:10.231700888 +0100
+++ /var/tmp/diff_new_pack.rZjCW1/_new 2021-03-24 16:09:10.235700892 +0100
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.1+git20210305.ca2bc53
+Version:2.1+git20210311.15cb3ad
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _servicedata ++
--- /var/tmp/diff_new_pack.rZjCW1/_old 2021-03-24 16:09:10.267700926 +0100
+++ /var/tmp/diff_new_pack.rZjCW1/_new 2021-03-24 16:09:10.267700926 +0100
@@ -1,6 +1,6 @@
git://github.com/kubic-project/microos-toolbox.git
-69991777899eee5a0da8d030f60cc05bbc816868
+15cb3adef516e0167737a407734c03e48ac4cf1a
\ No newline at end of file
++ microos-toolbox-2.1+git20210305.ca2bc53.tar.xz ->
microos-toolbox-2.1+git20210311.15cb3ad.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.1+git20210305.ca2bc53/toolbox
new/microos-toolbox-2.1+git20210311.15cb3ad/toolbox
--- old/microos-toolbox-2.1+git20210305.ca2bc53/toolbox 2021-03-05
17:50:57.0 +0100
+++ new/microos-toolbox-2.1+git20210311.15cb3ad/toolbox 2021-03-11
14:46:14.0 +0100
@@ -146,7 +146,7 @@
}
image_pull() {
-if [ -z ${SUDO} ]; then
+if [ -z ${SUDO} ] && [ $(id -u) -ne 0 ]; then
if [ ! `grep $USER /etc/subuid` ] || [ ! `grep $USER /etc/subgid` ];
then
echo "$0: ERROR: rootless mode wanted but no subuid and/or subgid
for user '$USER'"
echo " Toolbox will only work for this user if rootless podman is
configured properly."
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2021-03-10 08:50:36
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.2378 (New)
Package is "toolbox"
Wed Mar 10 08:50:36 2021 rev:12 rq:877276 version:2.1+git20210305.ca2bc53
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-03-02
12:28:11.403463950 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.2378/toolbox.changes
2021-03-10 08:52:00.590564125 +0100
@@ -1,0 +2,6 @@
+Fri Mar 05 16:52:01 UTC 2021 - ku...@suse.com
+
+- Update to version 2.1+git20210305.ca2bc53:
+ * Avoid copying the user setup script with 'podman cp'
+
+---
Old:
microos-toolbox-2.1+git20210226.daeb191.tar.xz
New:
microos-toolbox-2.1+git20210305.ca2bc53.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.n6GQid/_old 2021-03-10 08:52:00.962564508 +0100
+++ /var/tmp/diff_new_pack.n6GQid/_new 2021-03-10 08:52:00.962564508 +0100
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.1+git20210226.daeb191
+Version:2.1+git20210305.ca2bc53
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _servicedata ++
--- /var/tmp/diff_new_pack.n6GQid/_old 2021-03-10 08:52:01.002564550 +0100
+++ /var/tmp/diff_new_pack.n6GQid/_new 2021-03-10 08:52:01.002564550 +0100
@@ -1,6 +1,6 @@
git://github.com/kubic-project/microos-toolbox.git
-daeb191ea97061ee52b831ccd93442a2a7b00038
+69991777899eee5a0da8d030f60cc05bbc816868
\ No newline at end of file
++ microos-toolbox-2.1+git20210226.daeb191.tar.xz ->
microos-toolbox-2.1+git20210305.ca2bc53.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.1+git20210226.daeb191/toolbox
new/microos-toolbox-2.1+git20210305.ca2bc53/toolbox
--- old/microos-toolbox-2.1+git20210226.daeb191/toolbox 2021-02-26
09:27:41.0 +0100
+++ new/microos-toolbox-2.1+git20210305.ca2bc53/toolbox 2021-03-05
17:50:57.0 +0100
@@ -110,7 +110,6 @@
fi
mkdir -p /etc/sudoers.d/ && echo "${USER_NAME} ALL = (root) NOPASSWD:ALL" >
/etc/sudoers.d/${USER_NAME}
EOF
-${SUDO} podman cp "${tmp_user_setup}"
"${TOOLBOX_NAME}":"${tmp_user_setup}"
${SUDO} podman exec --user root "${TOOLBOX_NAME}" bash
"${tmp_user_setup}" &> "${tmp_user_setup_log}"
${SUDO} podman exec --user root "${TOOLBOX_NAME}" rm
"${tmp_user_setup}"
fi
@@ -127,6 +126,7 @@
cleanup() {
${SUDO} podman stop "$TOOLBOX_NAME" &>/dev/null
+${SUDO} rm -f $tmp_user_setup
}
container_exists() {
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2021-03-02 12:26:28
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.2378 (New)
Package is "toolbox"
Tue Mar 2 12:26:28 2021 rev:11 rq:875299 version:2.1+git20210226.daeb191
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-02-07
15:18:16.933693925 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.2378/toolbox.changes
2021-03-02 12:28:11.403463950 +0100
@@ -1,0 +2,22 @@
+Fri Feb 26 08:29:43 UTC 2021 - ku...@suse.com
+
+- Update to version 2.1+git20210226.daeb191:
+ * Set trap only after option parsing (#22)
+
+---
+Thu Feb 25 15:53:06 UTC 2021 - ku...@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 - ku...@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...
+
+---
Old:
microos-toolbox-2.1+git20210203.a669e3a.tar.xz
New:
microos-toolbox-2.1+git20210226.daeb191.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.2pwoCj/_old 2021-03-02 12:28:12.519464948 +0100
+++ /var/tmp/diff_new_pack.2pwoCj/_new 2021-03-02 12:28:12.523464953 +0100
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.1+git20210203.a669e3a
+Version:2.1+git20210226.daeb191
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _servicedata ++
--- /var/tmp/diff_new_pack.2pwoCj/_old 2021-03-02 12:28:12.555464981 +0100
+++ /var/tmp/diff_new_pack.2pwoCj/_new 2021-03-02 12:28:12.559464985 +0100
@@ -1,6 +1,6 @@
git://github.com/kubic-project/microos-toolbox.git
-e589434b4619773c676c7aef667f69b6d944da6b
+daeb191ea97061ee52b831ccd93442a2a7b00038
\ No newline at end of file
++ microos-toolbox-2.1+git20210203.a669e3a.tar.xz ->
microos-toolbox-2.1+git20210226.daeb191.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.1+git20210203.a669e3a/toolbox
new/microos-toolbox-2.1+git20210226.daeb191/toolbox
--- old/microos-toolbox-2.1+git20210203.a669e3a/toolbox 2021-02-03
11:29:25.0 +0100
+++ new/microos-toolbox-2.1+git20210226.daeb191/toolbox 2021-02-26
09:27:41.0 +0100
@@ -16,8 +16,6 @@
set -eo pipefail
-trap cleanup EXIT
-
# Defaults
REGISTRY=registry.opensuse.org
IMAGE=opensuse/toolbox
@@ -77,12 +75,12 @@
container_runlabel
return
fi
- # We want to do the user setup only when the container is created for
the first time
- [[ -n "${CREATE_AS_USER}" ]] && SETUP_USER=true
+# We want to do the user setup only when the container is created for
the first time
+[[ -n "${CREATE_AS_USER}" ]] && SETUP_USER=true
else
echo "Container '$TOOLBOX_NAME' already exists. Trying to start..."
echo "(To remove the container and start with a fresh toolbox, run:
podman rm '$TOOLBOX_NAME')"
- msg="start"
+msg="start"
fi
local state
@@ -100,16 +98,20 @@
echo "this may take some time. But this will only happen now that the
toolbox is being created)"
local tmp_user_setup
tmp_user_setup=$(mktemp
"${HOME}/.${TOOLBOX_NAME}-user-setup-XX.sh")
+tmp_user_setup_log="/dev/null"
+# DEBUG: uncomment the following line to see logs of the script in /tmp
+#tmp_user_setup_log="/tmp/$(basename -- ${tmp_user_setup}).log"
cat < "${tmp_user_setup}"
#!/bin/bash
-groupadd -g ${USER_GID} ${USER_GNAME} &> /dev/null
-useradd -M -N -g ${USER_GNAME} -u ${USER_ID} ${USER_NAME} &> /dev/null
-getent group wheel >/dev/null || zypper install -y --no-recommends sudo
system-group-wheel &> /dev/null
-echo "%wheel ALL = (root) NOPASSWD:ALL" > /etc/sudoers.d/wheel 2> /dev/null
-usermod -G wheel -a ${USER_NAME} &> /dev/null
+groupadd -g ${USER_GID} ${USER_GNAME}
+useradd -M -N -g ${USER_GNAME} -u ${USER_ID} ${USER_NAME}
+if ! command -v sudo &> /dev/null ; then
+ zypper install -y --no-recommends sudo
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2021-02-07 15:16:43
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.28504 (New)
Package is "toolbox"
Sun Feb 7 15:16:43 2021 rev:10 rq:868896 version:2.1+git20210203.a669e3a
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-02-01
13:25:03.249808395 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.28504/toolbox.changes
2021-02-07 15:18:16.933693925 +0100
@@ -1,0 +2,10 @@
+Wed Feb 03 10:33:22 UTC 2021 - ku...@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)
+
+---
Old:
microos-toolbox-2.0+git20210125.50611db.tar.xz
New:
microos-toolbox-2.1+git20210203.a669e3a.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.GG5jnU/_old 2021-02-07 15:18:17.529694918 +0100
+++ /var/tmp/diff_new_pack.GG5jnU/_new 2021-02-07 15:18:17.533694925 +0100
@@ -17,7 +17,7 @@
Name: toolbox
-Version:2.0+git20210125.50611db
+Version:2.1+git20210203.a669e3a
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _service ++
--- /var/tmp/diff_new_pack.GG5jnU/_old 2021-02-07 15:18:17.573694992 +0100
+++ /var/tmp/diff_new_pack.GG5jnU/_new 2021-02-07 15:18:17.573694992 +0100
@@ -1,8 +1,8 @@
-2.0
-2.0+git%cd.%h
-git://github.com/thkukuk/microos-toolbox.git
+2.1
+2.1+git%cd.%h
+git://github.com/kubic-project/microos-toolbox.git
git
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.GG5jnU/_old 2021-02-07 15:18:17.605695045 +0100
+++ /var/tmp/diff_new_pack.GG5jnU/_new 2021-02-07 15:18:17.605695045 +0100
@@ -1,6 +1,6 @@
-git://github.com/thkukuk/microos-toolbox.git
-50611dbcda36b1e7da6770ee498bd38bf4ab607a
+git://github.com/kubic-project/microos-toolbox.git
+e589434b4619773c676c7aef667f69b6d944da6b
\ No newline at end of file
++ microos-toolbox-2.0+git20210125.50611db.tar.xz ->
microos-toolbox-2.1+git20210203.a669e3a.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.0+git20210125.50611db/README.md
new/microos-toolbox-2.1+git20210203.a669e3a/README.md
--- old/microos-toolbox-2.0+git20210125.50611db/README.md 2021-01-25
11:23:20.0 +0100
+++ new/microos-toolbox-2.1+git20210203.a669e3a/README.md 2021-02-03
11:29:25.0 +0100
@@ -32,7 +32,10 @@
```
If a config file is found, with `REGISTRY` and `IMAGE` defined,
`${REGISTRY}/${IMAGE}` is used, overriding the default.
-If `-R` and/or `-I` (or `-i`) is/are used they override both the defaults and
the content of `REGISTRY` and/or `IMAGE` from the config file.
+If `-R` and/or `-I` (or `-i`) is/are used they override both the defaults and
+the content of `REGISTRY` and/or `IMAGE` from the config file. If an alternate
+image is used, the `REGISTRY` and/or `IMAGE` needs to be specified with every
+`toolbox` call.
### Configuration files
@@ -51,6 +54,7 @@
* `enter`: Enter a toolbox (creating it, if it does not exist, in our case)
* `run`: Run a command / start a program inside a toolbox
* `list`: Show existing toolboxes, although for now it is basically an alias
to `podman ps -a`
+This commands imply user mode (-u) and uses a different container
(`toolbox--user` vs. `toolbox-`).
### Rootless Usage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-2.0+git20210125.50611db/toolbox
new/microos-toolbox-2.1+git20210203.a669e3a/toolbox
--- old/microos-toolbox-2.0+git20210125.50611db/toolbox 2021-01-25
11:23:20.0 +0100
+++ new/microos-toolbox-2.1+git20210203.a669e3a/toolbox 2021-02-03
11:29:25.0 +0100
@@ -66,7 +66,8 @@
fi
local msg="creat"
-local runlabel=$(image_runlabel)
+local runlabel
+runlabel=$(image_runlabel) ||:
if ! container_exists; then
echo "Spawning a container '$TOOLBOX_NAME' with image '$TOOLBOX_IMAGE'"
if [[ -z "$runlabel" ]]; then
@@ -77,14 +78,15 @@
return
fi
# We want to do the user setup only when the container is created for
the first time
- [[ ! -z ${CREATE_AS_USER} ]] && SETUP_USER=true
+ [[ -n "${CREATE_AS_USER}" ]] && SETUP_USER=true
else
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2021-02-01 13:25:02
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.28504 (New)
Package is "toolbox"
Mon Feb 1 13:25:02 2021 rev:9 rq:866535 version:2.0+git20210125.50611db
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-01-22
21:50:07.633662146 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.28504/toolbox.changes
2021-02-01 13:25:03.249808395 +0100
@@ -1,0 +2,12 @@
+Mon Jan 25 10:24:32 UTC 2021 - ku...@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
+
+---
Old:
microos-toolbox-1.0+git20210119.b5acdcf.tar.xz
toolboxrc
New:
microos-toolbox-2.0+git20210125.50611db.tar.xz
toolboxrc.sle-micro
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.yp5ONl/_old 2021-02-01 13:25:04.073809687 +0100
+++ /var/tmp/diff_new_pack.yp5ONl/_new 2021-02-01 13:25:04.077809693 +0100
@@ -17,14 +17,14 @@
Name: toolbox
-Version:1.0+git20210119.b5acdcf
+Version:2.0+git20210125.50611db
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
Group: System/Management
URL:https://github.com/thkukuk/microos-toolbox
Source: microos-toolbox-%{version}.tar.xz
-Source1:toolboxrc
+Source1:toolboxrc.sle-micro
Requires: podman
BuildArch: noarch
++ _service ++
--- /var/tmp/diff_new_pack.yp5ONl/_old 2021-02-01 13:25:04.105809737 +0100
+++ /var/tmp/diff_new_pack.yp5ONl/_new 2021-02-01 13:25:04.105809737 +0100
@@ -1,7 +1,7 @@
-1.0
-1.0+git%cd.%h
+2.0
+2.0+git%cd.%h
git://github.com/thkukuk/microos-toolbox.git
git
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.yp5ONl/_old 2021-02-01 13:25:04.125809768 +0100
+++ /var/tmp/diff_new_pack.yp5ONl/_new 2021-02-01 13:25:04.125809768 +0100
@@ -1,6 +1,6 @@
git://github.com/thkukuk/microos-toolbox.git
-b5acdcfad5dd3f09536bd312790015f61c27f40a
+50611dbcda36b1e7da6770ee498bd38bf4ab607a
\ No newline at end of file
++ microos-toolbox-1.0+git20210119.b5acdcf.tar.xz ->
microos-toolbox-2.0+git20210125.50611db.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-1.0+git20210119.b5acdcf/README.md
new/microos-toolbox-2.0+git20210125.50611db/README.md
--- old/microos-toolbox-1.0+git20210119.b5acdcf/README.md 2021-01-19
11:01:40.0 +0100
+++ new/microos-toolbox-2.0+git20210125.50611db/README.md 2021-01-25
11:23:20.0 +0100
@@ -1,105 +1,129 @@
# toolbox - bring your own tools with you
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 as a reboot is always required. This makes it next to
impossible to debug such problems.
-`toolbox` is a small script that launches a podman container in a rootless or
rootfull state to let you bring in your favorite debugging or admin tools in
such a system. You can also install and run GUI applications in your `toolbox`
container. The root filesystem can be found at `/media/root`.
+`toolbox` is a small script that launches a podman container in a rootless or
rootfull state to let you bring in your favorite debugging or admin tools in
such a system.
+
+You can also install and run GUI applications in your `toolbox` container. The
root filesystem can be found at `/media/root`. In a "user toolbox" (i.e., one
started with `toolbox -u`) the user's home directory is available in the usual
place (`/home/$USER`).
+
+## Usage
-## Usage
-
The following options are avialbe in `toolbox`:
* `-h` or `--help`: Shows the help message
* `-u` or `--user`: Run as the current user inside the container
-* `-R` or `--registry` ``: Explicitly specify the registry to use
-* `-I` or `--image` ``: Explicitly specify the image to pull
+* `-R` or `--reg` ``: Explicitly specify the registry to use
+* `-I` or `--img` ``: Explicitly specify the image to pull
+* `-i` or `--image` ``: Full
commit toolbox for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2021-01-22 21:49:50
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.28504 (New)
Package is "toolbox"
Fri Jan 22 21:49:50 2021 rev:8 rq:865034 version:1.0+git20210119.b5acdcf
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2020-11-29
12:20:45.961537193 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.28504/toolbox.changes
2021-01-22 21:50:07.633662146 +0100
@@ -1,0 +2,12 @@
+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.l...@suse.com
+
+- Update to version 1.0+git20210119.b5acdcf:
+ * Dynamically set REGISTRY and IMAGE (#11)
+
+---
Old:
microos-toolbox-1.0+git20201126.3d26283.tar.xz
New:
microos-toolbox-1.0+git20210119.b5acdcf.tar.xz
toolboxrc
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.fsiLtZ/_old 2021-01-22 21:50:09.361664596 +0100
+++ /var/tmp/diff_new_pack.fsiLtZ/_new 2021-01-22 21:50:09.365664602 +0100
@@ -1,7 +1,7 @@
#
# spec file for package toolbox
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,14 @@
Name: toolbox
-Version:1.0+git20201126.3d26283
+Version:1.0+git20210119.b5acdcf
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
+Group: System/Management
URL:https://github.com/thkukuk/microos-toolbox
Source: microos-toolbox-%{version}.tar.xz
+Source1:toolboxrc
Requires: podman
BuildArch: noarch
@@ -42,10 +44,17 @@
%install
mkdir -p %{buildroot}%{_bindir}
install -m 755 toolbox %{buildroot}%{_bindir}/toolbox
+%if !0%{?is_opensuse}
+mkdir -p %{buildroot}%{_sysconfdir}
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/toolboxrc
+%endif
%files
%license LICENSE
%doc README.md
%{_bindir}/toolbox
+%if !0%{?is_opensuse}
+%config %{_sysconfdir}/toolboxrc
+%endif
%changelog
++ _servicedata ++
--- /var/tmp/diff_new_pack.fsiLtZ/_old 2021-01-22 21:50:09.413664670 +0100
+++ /var/tmp/diff_new_pack.fsiLtZ/_new 2021-01-22 21:50:09.413664670 +0100
@@ -1,6 +1,6 @@
git://github.com/thkukuk/microos-toolbox.git
-3d26283d2baa62d1351c3dbe356caf8590d202f0
+b5acdcfad5dd3f09536bd312790015f61c27f40a
\ No newline at end of file
++ microos-toolbox-1.0+git20201126.3d26283.tar.xz ->
microos-toolbox-1.0+git20210119.b5acdcf.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-1.0+git20201126.3d26283/toolbox
new/microos-toolbox-1.0+git20210119.b5acdcf/toolbox
--- old/microos-toolbox-1.0+git20201126.3d26283/toolbox 2020-11-26
11:47:36.0 +0100
+++ new/microos-toolbox-1.0+git20210119.b5acdcf/toolbox 2021-01-19
11:01:40.0 +0100
@@ -26,6 +26,8 @@
TOOLBOX_SHELL="/bin/bash"
SUDO=
+test -f /etc/toolboxrc && . /etc/toolboxrc
+
setup() {
# Allow user overrides
if [ -f "${TOOLBOXRC}" ]; then
++ toolboxrc ++
REGISTRY=registry.suse.com
IMAGE=suse/toolbox
[opensuse-commit] commit toolbox for openSUSE:Factory
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked
in at 2020-11-29 12:20:39
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.5913 (New)
Package is "toolbox"
Sun Nov 29 12:20:39 2020 rev:7 rq:851003 version:1.0+git20201126.3d26283
Changes:
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2020-09-06
21:37:51.761702276 +0200
+++ /work/SRC/openSUSE:Factory/.toolbox.new.5913/toolbox.changes
2020-11-29 12:20:45.961537193 +0100
@@ -1,0 +2,7 @@
+Thu Nov 26 10:48:21 UTC 2020 - ku...@suse.com
+
+- Update to version 1.0+git20201126.3d26283:
+ * Make it easier to use custom images (#10)
+ * Update toolbox doc (#9)
+
+---
Old:
microos-toolbox-1.0+git20200831.d2d2e5d.tar.xz
New:
microos-toolbox-1.0+git20201126.3d26283.tar.xz
Other differences:
--
++ toolbox.spec ++
--- /var/tmp/diff_new_pack.iSBpQj/_old 2020-11-29 12:20:46.721537961 +0100
+++ /var/tmp/diff_new_pack.iSBpQj/_new 2020-11-29 12:20:46.725537965 +0100
@@ -17,7 +17,7 @@
Name: toolbox
-Version:1.0+git20200831.d2d2e5d
+Version:1.0+git20201126.3d26283
Release:0
Summary:Script to start a toolbox container for system debugging
License:Apache-2.0
++ _servicedata ++
--- /var/tmp/diff_new_pack.iSBpQj/_old 2020-11-29 12:20:46.765538006 +0100
+++ /var/tmp/diff_new_pack.iSBpQj/_new 2020-11-29 12:20:46.765538006 +0100
@@ -1,6 +1,6 @@
git://github.com/thkukuk/microos-toolbox.git
-dc2edc81ba96c84cfde64d3883bfaf85241491c2
+3d26283d2baa62d1351c3dbe356caf8590d202f0
\ No newline at end of file
++ microos-toolbox-1.0+git20200831.d2d2e5d.tar.xz ->
microos-toolbox-1.0+git20201126.3d26283.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-toolbox-1.0+git20200831.d2d2e5d/README.md
new/microos-toolbox-1.0+git20201126.3d26283/README.md
--- old/microos-toolbox-1.0+git20200831.d2d2e5d/README.md 2020-08-31
10:39:03.0 +0200
+++ new/microos-toolbox-1.0+git20201126.3d26283/README.md 2020-11-26
11:47:36.0 +0100
@@ -1,9 +1,34 @@
# toolbox - bring your own tools with you
-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`.
+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 as a reboot is always required. This makes it next to
impossible to debug such problems.
+`toolbox` is a small script that launches a podman container in a rootless or
rootfull state to let you bring in your favorite debugging or admin tools in
such a system. You can also install and run GUI applications in your `toolbox`
container. The root filesystem can be found at `/media/root`.
-## Usage
+## Usage
+
+The following options are avialbe in `toolbox`:
+* `-h` or `--help`: Shows the help message
+* `-u` or `--user`: Run as the current user inside the container
+* `-R` or `--registry` ``: Explicitly specify the registry to use
+* `-I` or `--image` ``: Explicitly specify the image to pull
+* `-r` or `--root`: Runs podman via sudo as root
+* `-t` or `--tag` : Add to the toolbox name
+
+You may override the following variables by setting them in ${TOOLBOXRC}:
+* REGISTRY: The registry to pull from. Default value is:
`registry.opensuse.org`.
+* IMAGE: The image and tag from the registry to pull. Default value is:
`opensuse/toolbox`.
+* TOOLBOX_NAME: The name to use for the local container. Default value is:
`"${HOME}"/.toolboxrc`.
+* TOOLBOX_SHELL: Standard shell if no other commands are given. Default value
is: `/bin/bash`.
+
+Example toolboxrc:
+* `REGISTRY`=my.special.registry.example.com
+* `IMAGE`=debug:latest
+* `TOOLBOX_NAME`=special-debug-container
+* `TOOLBOX_SHELL`=/bin/bash"
+
+If a config file is found, with REGISTRY and IMAGE defined,
"${REGISTRY}/${IMAGE}" is used, overriding the default.
+If -R and/or -I is/are used they override both the defaults and the content of
REGISTRY and/or IMAGE from the config file.
+
+### Rootfull Usage Example
```
$ /usr/bin/toolbox
@@ -33,9 +58,11 @@
sh-5.0# vi /media/root/etc/passwd
```
-###
