From ec95bc77c04a7245b923f85fc6afda19b59e4f6c Mon Sep 17 00:00:00 2001
From: Devin Cowan <dcowan@cuahsi.org>
Date: Mon, 18 Mar 2024 12:25:02 -0400
Subject: [PATCH 1/3] add BRANCH_NAME

---
 .github/workflows/trigger-build-on-changes.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/trigger-build-on-changes.yml b/.github/workflows/trigger-build-on-changes.yml
index ebe0c3a..e4bbfad 100644
--- a/.github/workflows/trigger-build-on-changes.yml
+++ b/.github/workflows/trigger-build-on-changes.yml
@@ -7,6 +7,7 @@ env:
   DOCKER_USER: ${{ secrets.DOCKER_USER }}
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
   REPOSITORY: ${{ secrets.DOCKER_REPOSITORY }}
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 on:
   push:
@@ -63,12 +64,15 @@ jobs:
       - name: Echo env configuration and set image tag
         id: tagging
         run: |
+          echo "IMAGE_VARIANT: ${{ matrix.IMAGE_VARIANT }}"
           echo "JH_BASE: ${{ env.JH_BASE }}"
           echo "CUAHSI_BASE: ${{ env.CUAHSI_BASE }}"
           echo "BUILD_DATE: ${{ env.BUILD_DATE }}"
+          echo "GITHUB_SHA: $GITHUB_SHA"
+          echo "BRANCH_NAME: $BRANCH_NAME"
           echo ------------
           export DOCKER_TAG="${REPOSITORY}/${IMAGE_ROOT}-${{ matrix.IMAGE_VARIANT }}:${{ env.CUAHSI_BASE }}"
-          export DOCKER_FULL_PATH="$DOCKER_TAG-$GITHUB_SHA-built_on_$(date +'%Y.%m.%d')"
+          export DOCKER_FULL_PATH="$DOCKER_TAG-$BRANCH_NAME-$GITHUB_SHA-built_on_$(date +'%Y.%m.%d')"
           echo "DOCKER_FULL_PATH=$DOCKER_FULL_PATH" >> $GITHUB_ENV
           echo $DOCKER_FULL_PATH
           docker tag $DOCKER_TAG $DOCKER_FULL_PATH

From 77b3e8507eb32c631949eacb7c9459d11117f8c7 Mon Sep 17 00:00:00 2001
From: Devin Cowan <dcowan@cuahsi.org>
Date: Mon, 18 Mar 2024 12:30:44 -0400
Subject: [PATCH 2/3] simulate a change

---
 singleuser/base/Dockerfile.base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/singleuser/base/Dockerfile.base b/singleuser/base/Dockerfile.base
index cecb8d1..cf42819 100644
--- a/singleuser/base/Dockerfile.base
+++ b/singleuser/base/Dockerfile.base
@@ -83,6 +83,6 @@ RUN pip install hydroshare-on-jupyter==0.1.5 && \
 ENV DATA=${HOME}/downloads \
     OAUTH=${HOME}/.hs_auth
 
-# remove work dir b/c we're using "data"
+# remove work dir b/c we're using "data"!
 RUN rm -rf ~/work
 

From 2e6dd64038bebb7baf801177f0fb86f74d82cdcc Mon Sep 17 00:00:00 2001
From: Devin Cowan <dcowan@cuahsi.org>
Date: Mon, 18 Mar 2024 12:35:29 -0400
Subject: [PATCH 3/3] Revert "simulate a change"

This reverts commit 77b3e8507eb32c631949eacb7c9459d11117f8c7.
---
 singleuser/base/Dockerfile.base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/singleuser/base/Dockerfile.base b/singleuser/base/Dockerfile.base
index cf42819..cecb8d1 100644
--- a/singleuser/base/Dockerfile.base
+++ b/singleuser/base/Dockerfile.base
@@ -83,6 +83,6 @@ RUN pip install hydroshare-on-jupyter==0.1.5 && \
 ENV DATA=${HOME}/downloads \
     OAUTH=${HOME}/.hs_auth
 
-# remove work dir b/c we're using "data"!
+# remove work dir b/c we're using "data"
 RUN rm -rf ~/work