Merge branch 'master' of github.com:TheK4n/dotfiles

home/user/.config/bash/aliases

@@ -134,7 +134,7 @@ elif [[ "$OSTYPE" == "darwin" ]]; then
     alias paste='pbpaste'
 fi
 
-alias black='convert canvas:none PNG:- | feh -YF -'
+alias black='magick canvas:none PNG:- | feh -YF -'
 
 # :)
 alias PINK='beep -f 233 -l 440 -n -f 349 -l 440 -n -f 196 -l 440 -n -f 330 -l 650'

home/user/.config/i3/config

@@ -193,7 +193,7 @@ mode $exitmode {
         bindsym s exec shutdown -h now
         bindsym u exec systemctl suspend; mode "default"
         bindsym l exec $i3lock_cmd; mode "default"
-        bindsym b exec convert canvas:none PNG:- | feh -YF -; mode "default"
+        bindsym b exec magick canvas:none PNG:- | feh -YF -; mode "default"
 
         bindsym Escape mode "default"
         bindsym Return mode "default"

home/user/.docker/cli-plugins/docker-health

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+if [[ "$1" == "docker-cli-plugin-metadata" ]]; then
+cat << HERE
+{
+     "SchemaVersion": "0.1.0",
+     "Vendor": "Thek4n",
+     "Version": "0.1.0",
+     "ShortDescription": "Check health of docker container"
+}
+HERE
+exit
+fi
+
+usage() {
+cat <<EOF
+Usage: docker health CONTAINER
+
+Check health of docker container
+EOF
+}
+
+shift
+
+if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+    usage
+    exit 0
+fi
+
+
+readonly CONTAINER="$1"
+
+if [ -z "$CONTAINER" ]; then
+    echo "Error: Container name was not specified"
+    exit 1
+fi
+
+set -e
+
+status="$(docker container inspect --format='{{index .State.Health.Status}}' "$CONTAINER")"
+readonly status
+
+echo "$status"
+test "$status" = 'healthy'

home/user/.docker/cli-plugins/docker-ips

@@ -4,22 +4,41 @@ if [[ "$1" == "docker-cli-plugin-metadata" ]]; then
 cat << HERE
 {
      "SchemaVersion": "0.1.0",
-     "Vendor": "example.com",
-     "Version": "v0.1.0",
-     "ShortDescription": "Bash based Docker cli-plugin"
+     "Vendor": "Thek4n",
+     "Version": "0.1.0",
+     "ShortDescription": "Show containers ip addresses"
 }
 HERE
 exit
 fi
 
+usage() {
+cat <<EOF
+Usage: docker ips
+
+Show containers ip addresses
+EOF
+}
+
+shift
+
+if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+    usage
+    exit 0
+fi
+
+set -e
+
 result="CONTAINER NAME;IMAGE;IP\n"
 
 for container in $(docker ps -q | tr '\n' ' ')
 do
-    IP="$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$container" 2>/dev/null)"
+    ip="$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$container" 2>/dev/null)"
     container_name="$(docker inspect --format='{{.Name}}' "$container" 2>/dev/null)"
     image_name="$(docker inspect --format='{{.Config.Image}}' "$container" 2>/dev/null)"
-    result+="${container_name#"/"};$image_name;$IP\n"
+
+    result+="${container_name#"/"};${image_name};${ip}\n"
 done
 
-echo -e $result 2>/dev/null | column -t -s ";"
+echo -e "$result" 2>/dev/null | column -t -s ";"
+exit 0

home/user/.docker/cli-plugins/docker-shell

@@ -4,13 +4,39 @@ if [[ "$1" == "docker-cli-plugin-metadata" ]]; then
 cat << HERE
 {
      "SchemaVersion": "0.1.0",
-     "Vendor": "example.com",
-     "Version": "v0.1.0",
-     "ShortDescription": "Bash based Docker cli-plugin"
+     "Vendor": "Thek4n",
+     "Version": "0.1.0",
+     "ShortDescription": "Open interactive bash in container"
 }
 HERE
 exit
 fi
 
-docker exec -it $2 bash
+usage() {
+cat <<EOF
+Usage: docker shell CONTAINER
 
+Enter the container shell (bash or sh)
+EOF
+}
+
+shift
+
+if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+    usage
+    exit 0
+fi
+
+readonly CONTAINER="$1"
+
+if [ -z "$CONTAINER" ]; then
+    echo "Error: Container was not specified"
+    exit 1
+fi
+
+set -e
+
+docker exec -it "$CONTAINER" \
+    /bin/sh -c "[ -e /bin/bash ] && exec /bin/bash || exec /bin/sh"
+
+exit 0