From 84ed6e4699c23f0b47bad5e44ba059af3aa1a13c Mon Sep 17 00:00:00 2001
From: Natalie Schultz <90212258+nataliejschultz@users.noreply.github.com>
Date: Fri, 29 Mar 2024 12:41:51 -0600
Subject: [PATCH 1/5] Testing our collaboration

Testing how a push will look when working on a fork
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 7fa923ea0..8105f51b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,6 +34,7 @@ ENV WEB_SERVER_HOST=''
 ENV LIVERELOAD_SRC=''
 ENV STUDY_CONFIG=''
 RUN chmod u+x ./.docker/docker_start_script.sh
+RUN echo "hello world!"
 
 EXPOSE 8080
 

From 82c576b89601aeb08204afe00ab9134552bf0b81 Mon Sep 17 00:00:00 2001
From: Natalie Schultz <90212258+nataliejschultz@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:54:06 -0600
Subject: [PATCH 2/5] Env vars updated, trying again

Commenting out the image building/pushing so it doesn't actually push an image, but
---
 .github/workflows/image_build_push.yml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/image_build_push.yml b/.github/workflows/image_build_push.yml
index 3b991786a..9e8127593 100644
--- a/.github/workflows/image_build_push.yml
+++ b/.github/workflows/image_build_push.yml
@@ -38,11 +38,22 @@ jobs:
       run: echo running in repo ${GITHUB_REPOSITORY#*/} branch ${GITHUB_REF##*/} on ${{ steps.date.outputs.date }}
 
     # Runs a set of commands using the runners shell
-    - name: build docker image
-      run: |
-        docker build -t $DOCKER_USER/${GITHUB_REPOSITORY#*/}:${GITHUB_REF##*/}_${{ steps.date.outputs.date }} .
-        docker images
+    # - name: build docker image
+    #   run: |
+    #     docker build -t $DOCKER_USER/${GITHUB_REPOSITORY#*/}:${GITHUB_REF##*/}_${{ steps.date.outputs.date }} .
+    #     docker images
+
+    # - name: push docker image
+    #   run: |
+    #     docker push $DOCKER_USER/${GITHUB_REPOSITORY#*/}:${GITHUB_REF##*/}_${{ steps.date.outputs.date }}
 
-    - name: push docker image
+    - name: Write tag file 
       run: |
-        docker push $DOCKER_USER/${GITHUB_REPOSITORY#*/}:${GITHUB_REF##*/}_${{ steps.date.outputs.date }}
+        echo 'foo bar' > tag.txt
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: Create tag artifact
+        path: tag.txt
+        if-no-files-found: error
+        overwrite: true

From 619ee7729f1a9175a9232913fdc4ad889de05a3c Mon Sep 17 00:00:00 2001
From: Natalie Schultz <90212258+nataliejschultz@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:57:46 -0600
Subject: [PATCH 3/5] Adding branch to see if it runs GHA

Adding push branch
---
 .github/workflows/image_build_push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/image_build_push.yml b/.github/workflows/image_build_push.yml
index 9e8127593..3d62387eb 100644
--- a/.github/workflows/image_build_push.yml
+++ b/.github/workflows/image_build_push.yml
@@ -6,7 +6,7 @@ name: docker image
 # events but only for the master branch
 on:
   push:
-    branches: [ master, gis-based-mode-detection ]
+    branches: [ master, gis-based-mode-detection, natalie-branch ]
 
 
 # Env variable

From 8e027180710474277f7087aa2fa8af6a5381cd8c Mon Sep 17 00:00:00 2001
From: Natalie Schultz <90212258+nataliejschultz@users.noreply.github.com>
Date: Thu, 4 Apr 2024 17:36:14 -0600
Subject: [PATCH 4/5] Minor edits

Testing to see if environment variables are easily written into the file as expected
---
 .github/workflows/image_build_push.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/image_build_push.yml b/.github/workflows/image_build_push.yml
index 3d62387eb..085c1568f 100644
--- a/.github/workflows/image_build_push.yml
+++ b/.github/workflows/image_build_push.yml
@@ -49,11 +49,11 @@ jobs:
 
     - name: Write tag file 
       run: |
-        echo 'foo bar' > tag.txt
+        echo 'foo bar' > ${{ steps.date.outputs.date }}
 
     - uses: actions/upload-artifact@v4
       with:
-        name: Create tag artifact
+        name: server-image-tag
         path: tag.txt
         if-no-files-found: error
         overwrite: true

From 86d2d947321cd29d4571fc9f10d6fcc45f8405c0 Mon Sep 17 00:00:00 2001
From: Natalie Schultz <90212258+nataliejschultz@users.noreply.github.com>
Date: Thu, 4 Apr 2024 17:39:08 -0600
Subject: [PATCH 5/5] Syntax

Goal of the last push was done incorrectly. Oops.
---
 .github/workflows/image_build_push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/image_build_push.yml b/.github/workflows/image_build_push.yml
index 085c1568f..f7cb2058e 100644
--- a/.github/workflows/image_build_push.yml
+++ b/.github/workflows/image_build_push.yml
@@ -49,7 +49,7 @@ jobs:
 
     - name: Write tag file 
       run: |
-        echo 'foo bar' > ${{ steps.date.outputs.date }}
+        echo '${{ steps.date.outputs.date }}' > tag.txt
 
     - uses: actions/upload-artifact@v4
       with: