Add visioning similar to dockwatch

austinwbest · austinwbest · commit 99538c97094c · 2024-11-12T23:26:29.000-05:00
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -79,3 +79,8 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          build-args: |
+            "BUILD_DATE=${{ env.BUILD_DATE }}"
+            "COMMITS=${{ env.COMMITS }}"
+            "BRANCH=${{ github.ref_name }}"
+            "COMMIT=${{ github.sha }}"
diff --git a/Dockerfile b/Dockerfile
@@ -25,6 +25,16 @@ HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --start-interval=10
 # add local files
 COPY root/ /
 
+ARG COMMIT=unknown
+ARG COMMITS=0
+ARG BRANCH=unknown
+ARG COMMIT_MSG=unknown
+RUN echo -e "\n//-- DOCKERFILE DEFINES"                         >> /app/www/public/includes/constants.php \
+    && echo "define('DOCKERFILE_BUILD_DATE', '${BUILD_DATE}');" >> /app/www/public/includes/constants.php \
+    && echo "define('DOCKERFILE_COMMIT', '${COMMIT}');"         >> /app/www/public/includes/constants.php \
+    && echo "define('DOCKERFILE_COMMITS', '${COMMITS}');"       >> /app/www/public/includes/constants.php \
+    && echo "define('DOCKERFILE_BRANCH', '${BRANCH}');"         >> /app/www/public/includes/constants.php
+
 # ports and volumes
 EXPOSE 80 443
 
diff --git a/root/app/www/public/functions/git.php b/root/app/www/public/functions/git.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+----------------------------------
+ ------  Created: 111224   ------
+ ------  Austin Best	   ------
+----------------------------------
+*/
+
+function gitBranch()
+{
+    if (!defined('DOCKERFILE_BRANCH')) {
+        return 'Source';
+    }
+       
+    return DOCKERFILE_BRANCH;
+}
+
+function gitHash()
+{
+    if (!defined('DOCKERFILE_COMMIT')) {
+        return 'Unknown';
+    }
+
+    return DOCKERFILE_COMMIT;
+}
+
+function gitMessage()
+{
+    if (!defined('DOCKERFILE_COMMIT_MSG')) {
+        return 'Unknown';
+    }
+
+    return DOCKERFILE_COMMIT_MSG;
+}
+
+function gitVersion()
+{
+    if (!defined('DOCKERFILE_COMMITS')) {
+        return '<span class="text-small text-secondary" title="Branch: ' . gitBranch() . ' - Commit: ' . gitHash() . '">v0.0.0</span>';
+    }
+
+    return '<span class="text-small text-secondary" title="Branch: ' . gitBranch() . ' - Commit: ' . gitHash() . '">v' . APP_X . '.' . APP_Y . '.' . DOCKERFILE_COMMITS . '</span>';
+}
diff --git a/root/app/www/public/includes/constants.php b/root/app/www/public/includes/constants.php
@@ -10,6 +10,8 @@
 define('APP_NAME', 'Starr Proxy');
 define('APP_API_ERROR', APP_NAME .': %s');
 define('APP_URL', ($_SERVER['REQUEST_SCHEME'] ?: 'http') . '://'. $_SERVER['HTTP_HOST']);
+define('APP_X', 0);
+define('APP_Y', 1);
 
 define('STARR_BACKUP_AGE', 2); //-- DELETE AFTER THIS AMOUNT OF DAYS
 
diff --git a/root/app/www/public/includes/header.php b/root/app/www/public/includes/header.php
@@ -48,7 +48,10 @@
     <body>
         <nav class="navbar navbar-expand-lg bg-dark" data-bs-theme="dark">
             <div class="container-fluid">
-                <a class="navbar-brand" href="?page=home"><img src="images/logo-32.png"> <?= APP_NAME ?></a>
+                <a class="navbar-brand" href="?page=home">
+                    <img src="images/logo-32.png"> <?= APP_NAME ?>
+                    <?= gitVersion() ?>
+                </a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>
