feat: add the short SHA to develop containers

Closes: #101

Author: JohnVillalovos

.github/workflows/build_and_publish.yml

@@ -6,6 +6,10 @@ on:
       appGitRefs:
         required: true
         type: string
+      appAddSha:
+        required: false
+        type: boolean
+        default: false
       imgBuild:
         required: true
         type: string
@@ -71,5 +75,6 @@ jobs:
             VERSION_PHP=${{ vars.VERSION_PHP }}
             VERSION_COMPOSER=${{ vars.VERSION_COMPOSER }}
             APP_GH_REF=${{ inputs.appGitRefs }}
+            APP_GH_ADD_SHA=${{ inputs.appAddSha }}
           tags: ${{ steps.set_meta.outputs.tags }}
           push: true

.github/workflows/build_image_develop.yml

@@ -6,12 +6,13 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-develop:
-    uses: ./.github/workflows/build_and_publish.yml
-    with:
-      appGitRefs: develop
-      imgBuild: ${{ vars.IMAGE_BUILD }}
-      regName: ${{ vars.REGISTRY_URL }}
-      regLogin: ${{ vars.REGISTRY_LOGIN }}
+  build-develop:
+    uses: ./.github/workflows/build_and_publish.yml
+    with:
+      appGitRefs: develop
+      appAddSha: true
+      imgBuild: ${{ vars.IMAGE_BUILD }}
+      regName: ${{ vars.REGISTRY_URL }}
+      regLogin: ${{ vars.REGISTRY_LOGIN }}
     secrets:
       REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}

BUILD.md

@@ -36,14 +36,20 @@ This is the easiest and fastest way.
    APP_RELEASE=develop
    if [ "${APP_RELEASE}" == "develop" ]; then
      APP_GH_REF="refs/heads/${APP_RELEASE}"
+     APP_GH_ADD_SHA=true
    else
      APP_GH_REF="refs/tags/${APP_RELEASE}"
+     APP_GH_ADD_SHA=false
    fi
 
    # Build the docker image
    docker buildx build \
      --build-arg APP_GH_REF=${APP_GH_REF} \
+     --build-arg APP_GH_ADD_SHA=${APP_GH_ADD_SHA} \
      --tag librebooking/librebooking:$(echo ${APP_RELEASE} | sed -e "s/^v//") \
      --output type=docker \
      .
    ```
+
+When `APP_GH_ADD_SHA=true`, the web UI footer appends the LibreBooking app
+short SHA to the displayed version string.

Dockerfile

@@ -72,13 +72,36 @@ EORUN
 
 # Get and customize librebooking
 ARG APP_GH_REF
+ARG APP_GH_ADD_SHA=false
 RUN <<EORUN
 set -xeuo pipefail
+LB_TARBALL_URL="https://api.github.com/repos/LibreBooking/librebooking/tarball/${APP_GH_REF}"
 curl \
   --fail \
   --silent \
-  --location https://api.github.com/repos/librebooking/librebooking/tarball/${APP_GH_REF} \
+  --location ${LB_TARBALL_URL} \
 | tar --extract --gzip --directory=/var/www/html --strip-components=1
+if [ "${APP_GH_ADD_SHA}" = "true" ]; then
+  LB_SHORT_SHA=""
+  # TARBALL_FILENAME will be like the result of a `git describe` For
+  # example: 'LibreBooking-librebooking-v4.1.0-126-g6cc8a4c.tar.gz' where
+  # 'g6cc8a4c' is the short SHA prefixed with 'g'. So the short SHA is
+  # '6cc8a4c'
+  TARBALL_FILENAME=$(\
+    curl \
+      --head \
+      --fail \
+      --silent \
+      --show-error \
+      --location ${LB_TARBALL_URL} \
+    | sed -nE 's/.*filename="?([^";]+)"?.*/\1/p')
+  LB_SHORT_SHA=$(echo $TARBALL_FILENAME | sed -E 's/.*-g([0-9a-f]+)\.tar\.gz/\1/')
+  if [ -n "${LB_SHORT_SHA}" ]; then
+    printf '%s\n' "${LB_SHORT_SHA}" > /var/www/html/config/version-suffix.txt
+  else
+    echo ERROR determining the LB_SHORT_SHA value
+  fi
+fi
 if [ -f /var/www/html/composer.json ]; then
   sed \
     -i /var/www/html/composer.json \