From c73aa4a69269d64a2b2ded377d044790048ac192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20H=C3=A4hlen?= Date: Thu, 20 Jun 2024 22:31:10 +0200 Subject: [PATCH 1/7] First try --- CHANGELOG.md | 4 ++++ build-files/CHANGELOG.md | 9 +++------ dc | 4 ++-- dc-completion | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53e0630..36b6031 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# Version 3.4.1 +## Improvement +- `dc ips` supports multiple ips - #68 + # Version 3.4.0 ## New Feature - `dc shell ` to get a shell diff --git a/build-files/CHANGELOG.md b/build-files/CHANGELOG.md index 7db57a8..ff3817c 100644 --- a/build-files/CHANGELOG.md +++ b/build-files/CHANGELOG.md @@ -1,6 +1,3 @@ -# Version 3.4.0 -## New Feature -- `dc shell ` to get a shell - -## Removal -- Removed `network` command +# Version 3.4.1 +## Improvement +- `dc ips` supports multiple ips - #68 diff --git a/dc b/dc index 283d315..1c3093c 100755 --- a/dc +++ b/dc @@ -6,7 +6,7 @@ set -m # VERSION -export DC_VERSION=v3.4.0 +export DC_VERSION=v3.4.1-dev ###### VARIABLES if [[ -z "${DC_DIR}" ]]; then @@ -692,7 +692,7 @@ function shell(){ # IPS function ips(){ printf "Showing IPs \n" - (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}}{{end}}' "$(docker ps -aq)"| sort -k 2 -V) | column -t -s ' ' + (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}} {{end}}' "$(docker ps -aq)"| sort -k 2 -V) | column -t -s ' ' } function prune() { diff --git a/dc-completion b/dc-completion index 74f0249..6097b23 100755 --- a/dc-completion +++ b/dc-completion @@ -2,7 +2,7 @@ # Copyright (C) 2022 - 2023 Ben Hählen # This is the completion file for `dc` ############## -# Version 3.4.0 +# Version 3.4.1-dev ############## _dc_completions() { From 04afaf792839420dc5c4d81f61b075a429fc8c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20H=C3=A4hlen?= Date: Thu, 20 Jun 2024 22:31:54 +0200 Subject: [PATCH 2/7] Hm --- dc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dc b/dc index 1c3093c..6892348 100755 --- a/dc +++ b/dc @@ -692,7 +692,7 @@ function shell(){ # IPS function ips(){ printf "Showing IPs \n" - (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}} {{end}}' "$(docker ps -aq)"| sort -k 2 -V) | column -t -s ' ' + (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}}{{end}}' "$(docker ps -aq)"| sort -k 2 -V) | column -t -s ' ' } function prune() { From a7fe814700700252e964ee921ac5e35bb96be63c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20H=C3=A4hlen?= Date: Thu, 20 Jun 2024 22:32:51 +0200 Subject: [PATCH 3/7] Remove quotes --- dc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dc b/dc index 6892348..ed9c27f 100755 --- a/dc +++ b/dc @@ -692,7 +692,7 @@ function shell(){ # IPS function ips(){ printf "Showing IPs \n" - (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}}{{end}}' "$(docker ps -aq)"| sort -k 2 -V) | column -t -s ' ' + (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}}{{end}}' $(docker ps -aq)| sort -k 2 -V) | column -t -s ' ' } function prune() { From dff77f48d496c1f1fc1ea8010a05def7511424ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20H=C3=A4hlen?= Date: Thu, 20 Jun 2024 22:37:07 +0200 Subject: [PATCH 4/7] Fix --- dc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dc b/dc index ed9c27f..7d01965 100755 --- a/dc +++ b/dc @@ -692,7 +692,7 @@ function shell(){ # IPS function ips(){ printf "Showing IPs \n" - (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}}{{end}}' $(docker ps -aq)| sort -k 2 -V) | column -t -s ' ' + (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}} {{end}}' $(docker ps -aq)| sort -k 2 -V) | column -t -s ' ' } function prune() { From 83996c3d4c40d803cebdb1d678cff3b35275f8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20H=C3=A4hlen?= Date: Thu, 20 Jun 2024 22:57:04 +0200 Subject: [PATCH 5/7] format --- dc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dc b/dc index 7d01965..e7a53d0 100755 --- a/dc +++ b/dc @@ -692,7 +692,7 @@ function shell(){ # IPS function ips(){ printf "Showing IPs \n" - (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}} {{end}}' $(docker ps -aq)| sort -k 2 -V) | column -t -s ' ' + (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}} | {{end}}' $(docker ps -aq)| sort -k 2 -V) | column -t -s ' ' } function prune() { From 35d1df7523b60914afe34e1543c0aa0cd15336c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20H=C3=A4hlen?= Date: Thu, 20 Jun 2024 22:57:40 +0200 Subject: [PATCH 6/7] format --- dc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dc b/dc index e7a53d0..68f8dec 100755 --- a/dc +++ b/dc @@ -692,7 +692,7 @@ function shell(){ # IPS function ips(){ printf "Showing IPs \n" - (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}} | {{end}}' $(docker ps -aq)| sort -k 2 -V) | column -t -s ' ' + (echo "CONTAINER IP-ADRESS MAC-ADDRESS"; docker inspect --format='{{.Name}} {{range .NetworkSettings.Networks}}{{.IPAddress}} {{.MacAddress}} | {{end}}' $(docker ps -aq)| sort -k 2 -V) | column -t -s ' ' } function prune() { From 295d57cc65fa772fd791ab0be74bea070076ea8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20H=C3=A4hlen?= Date: Thu, 20 Jun 2024 22:59:14 +0200 Subject: [PATCH 7/7] Prepare release --- dc | 2 +- dc-completion | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dc b/dc index 68f8dec..02f0a9b 100755 --- a/dc +++ b/dc @@ -6,7 +6,7 @@ set -m # VERSION -export DC_VERSION=v3.4.1-dev +export DC_VERSION=v3.4.1 ###### VARIABLES if [[ -z "${DC_DIR}" ]]; then diff --git a/dc-completion b/dc-completion index 6097b23..9ee771b 100755 --- a/dc-completion +++ b/dc-completion @@ -2,7 +2,7 @@ # Copyright (C) 2022 - 2023 Ben Hählen # This is the completion file for `dc` ############## -# Version 3.4.1-dev +# Version 3.4.1 ############## _dc_completions() {