From b843839722808be61f82ca099990258f0cadf664 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 12 Aug 2024 16:52:41 +0300 Subject: [PATCH 1/2] [support/apps] Fix Docker version extraction --- CHANGELOG.md | 4 ++++ support/apps/apps.go | 2 +- version.go | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba0dbe06..e6058c3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Changelog +### [13.3.2](https://kaos.sh/ek/13.3.3) + +- `[support/apps]` Fixed Docker version extraction + ### [13.3.2](https://kaos.sh/ek/13.3.2) - `[support/apps]` Added support for Docker, Podman, and LXC diff --git a/support/apps/apps.go b/support/apps/apps.go index 779afa06..bf7378b1 100644 --- a/support/apps/apps.go +++ b/support/apps/apps.go @@ -119,7 +119,7 @@ func SVN() support.App { // Docker extracts version info from Docker command output func Docker() support.App { ver := extractField(execVersionCmd("docker", "--version"), 0, 2) - return support.App{"docker", ver} + return support.App{"docker", strings.TrimRight(ver, ",")} } // Podman extracts version info from Podman command output diff --git a/version.go b/version.go index feb300e1..8a0fafc0 100644 --- a/version.go +++ b/version.go @@ -8,4 +8,4 @@ package ek // ////////////////////////////////////////////////////////////////////////////////// // // VERSION is current ek package version -const VERSION = "13.3.2" +const VERSION = "13.3.3" From bc156485f76cb20908404a5ece64b52ff17efb26 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 12 Aug 2024 17:48:58 +0300 Subject: [PATCH 2/2] [support] Improve output of large list of IPv4 and IPv6 addresses --- CHANGELOG.md | 1 + support/support.go | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6058c3e..a1b9b4d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### [13.3.2](https://kaos.sh/ek/13.3.3) - `[support/apps]` Fixed Docker version extraction +- `[support]` Improved output of large list of IPv4 and IPv6 addresses ### [13.3.2](https://kaos.sh/ek/13.3.2) diff --git a/support/support.go b/support/support.go index f87ea875..23ebf84d 100644 --- a/support/support.go +++ b/support/support.go @@ -601,8 +601,14 @@ func (i *Info) printNetworkInfo() { format(0, false, "Hostname", i.Network.Hostname, "Public IP", i.Network.PublicIP, - "IP v4", strings.Join(i.Network.IPv4, " "), - "IP v6", strings.Join(i.Network.IPv6, " "), + "IP v4", strings.TrimLeft(fmtutil.Wrap( + strings.Join(i.Network.IPv4, " "), + strings.Repeat(" ", 13), 80, + ), " "), + "IP v6", strings.TrimLeft(fmtutil.Wrap( + strings.Join(i.Network.IPv6, " "), + strings.Repeat(" ", 13), 80, + ), " "), ) }