Add service name and description

Author: pmeulen

stepup/version-info.sh

@@ -13,47 +13,57 @@ if [ -z "$running" ]; then
     exit 1
 fi
 
-# Use docker compose ps with JSON output to get the image and labels of the running containers
-image_list=$(docker compose -p stepup -f "${DIR}/docker-compose.yml" ps --format json | jq -s 'sort_by(.Image) | .[] | .Image,.Labels')
+# Use docker compose ps with JSON output to get the image, service name and labels of the running containers
+image_list=$(docker compose -p stepup -f "${DIR}/docker-compose.yml" ps --format json | jq -s 'sort_by(.Service) | .[] | .Image,.Service,.Labels')
 
-# image_list is text lines with image and labels alternating:
+# image_list is text lines with service, image and labels alternating:
 # "image1"
+# "service1"
 # "labels1_1=value1_1,labels1_2=value1_2, ..."
 # "image2"
+# "service2"
 # "labels2_1=value2_1,labels2_2=value2_2, ..."
 # ...
-# Get the image name and the value for the "opencontainers.image.version" label
 
 # Table header
-printf "%-10s %-21s %-13s %s\n" "Git SHA-1" "Build date" "Version" "Image"
+printf "%-12s %-20s %-10s %-21s %-13s %s\n" "Service" "Title" "Git SHA-1" "Build date" "Version" "Image"
 
 # process the image_list
 while read -r image; do
-    # Remove the quotes
-    image=$(echo $image | tr -d '"')
+    image=$(echo "${image}" | tr -d '"') # Remove the quotes
+
+    read -r service
+    service=$(echo "${service}" | tr -d '"') # Remove the quotes
+
     read -r labels
-    # Remove the quotes and split the labels into an array by the comma, do not split on whitespace
-    labels=$(echo $labels | tr -d '"')
+    # Remove the quotes and split the labels into an array by comma
+    labels=$(echo "${labels}" | tr -d '"')
     IFS=',' read -r -a label_array <<< "$labels"
 
+    title="-"   # Image title (org.opencontainers.image.title)
     version="-" # Version (git tag) of the image
     date="-"    # Date and time the image was created
     commit="-"  # Git SHA-1 commit hash of the source code used to build the image
     # Find the label with the key "org.opencontainers.image.version"
     for label in "${label_array[@]}"; do
-        key=$(echo $label | cut -d= -f1)
+        key=$(echo "${label}" | cut -d= -f1)
+        if [ "$key" == "org.opencontainers.image.title" ]; then
+            value=$(echo "${label}" | cut -d= -f2)
+            title=$value
+        fi
         if [ "$key" == "org.opencontainers.image.revision" ]; then
-            value=$(echo $label | cut -d= -f2)
+            value=$(echo "${label}" | cut -d= -f2)
             commit=$value
         fi
         if [ "$key" == "org.opencontainers.image.version" ]; then
-            value=$(echo $label | cut -d= -f2)
+            value=$(echo "${label}" | cut -d= -f2)
             version=$value
         fi
         if [ "$key" == "org.opencontainers.image.created" ]; then
-            value=$(echo $label | cut -d= -f2)
-            date=$value
+            value=$(echo "${label}" | cut -d= -f2)
+            # Date is formatted in ISO, convert to local timezone
+            date=$(date -j -f "%Y-%m-%dT%H:%M:%S" "${value}Z" "+%Y-%m-%d %H:%M:%S" 2>/dev/null || date -d "${value}Z" "+%Y-%m-%d %H:%M:%S" 2>/dev/null || echo "$value")
         fi
     done
-    printf "%-10s %-21s %-13s %s\n" "${commit:0:6}" "${date:0:19}" "$version" "$image"
+    printf "%-12s %-20s %-10s %-21s %-13s %s\n" "${service:0:12}" "${title:0:19}" "${commit:0:6}" "${date:0:19}" "$version" "$image"
 done <<< "$image_list"