Print the branch names in dev builds

run.sh

@@ -1,6 +1,7 @@
 echo '* Running <run.sh>...'
 echo "* Current working directory: $(pwd)"
 echo "* Current node/npm versions: node $(node --version); npm $(npm --version)"
+echo "* Current fe/be branches: $VITE_FE_BRANCH; $VITE_BE_BRANCH"
 
 if [ ! -e node_modules ]; then
     echo '* No node_modules/ dir found, installing dependencies...'

simoc-web.py

@@ -8,6 +8,8 @@
 
 IMGNAME = 'frontend-dev'
 SIMOC_WEB_DIR = pathlib.Path(__file__).resolve().parent
+# both dirs *should* have the same parent dir
+SIMOC_DIR = SIMOC_WEB_DIR.parent / 'simoc'
 
 COMMANDS = {}
 
@@ -40,7 +42,10 @@ def docker_run(*args):
     cp = subprocess.run(['docker', 'network', 'inspect', net_name],
                         capture_output=True)
     net_args = ['--network', net_name] if cp.returncode == 0 else []
+    fe_branch = f'VITE_FE_BRANCH={get_current_branch(SIMOC_WEB_DIR)}'
+    be_branch = f'VITE_BE_BRANCH={get_current_branch(SIMOC_DIR)}'
     return run(['docker', 'run', '--rm', *net_args, '-p', '8080:8080',
+                '-e', fe_branch, '-e', be_branch,
                 '-v', f'{SIMOC_WEB_DIR}:/frontend', *args])
 
 def install_docker():
@@ -68,6 +73,13 @@ def install_docker_linux():
     print()
     return False
 
+def get_current_branch(dir):
+    branch_cmd = ['git', 'branch', '--show-current']
+    try:
+        return subprocess.check_output(branch_cmd, cwd=dir).decode().strip()
+    except subprocess.CalledProcessError:
+        return 'unknown'
+
 @cmd
 def build_image():
     """Build the frontend-dev image locally."""
@@ -97,7 +109,7 @@ def build():
 def copy_dist_dir():
     """Copy the dist dir into the "simoc" repo."""
     # assume that both the simoc and simoc-web repos are in the same dir
-    simoc_server_dir = SIMOC_WEB_DIR.parent / 'simoc' / 'simoc_server'
+    simoc_server_dir = SIMOC_DIR / 'simoc_server'
     simoc_web_dist_dir = SIMOC_WEB_DIR / 'dist'
     if not simoc_server_dir.exists():
         print(f'* <{simoc_server_dir}> does not exist')

src/components/base/BaseEntry.vue

@@ -29,12 +29,22 @@
                 EULA
             </a>
         </footer>
+        <div v-if="!is_ngs" id="branch">
+            {{env.MODE}} build
+            <template v-if="env.VITE_FE_BRANCH">/ fe: {{env.VITE_FE_BRANCH}}</template>
+            <template v-if="env.VITE_BE_BRANCH"> / be: {{env.VITE_BE_BRANCH}}</template>
+        </div>
     </div>
 </template>
 
 <script>
 export default {
-
+    data() {
+        return {
+            env: import.meta.env,
+            is_ngs: window.location.hostname.startsWith('ngs'),
+        }
+    },
 }
 </script>
 
@@ -159,6 +169,11 @@ export default {
         justify-content:space-evenly;
         align-items:center;
     }
+    #branch {
+        margin-top: 1em;
+        color: #666666;
+        font-size: 80%;
+    }
 </style>
 
 <style lang="scss">