From 1ccbc6cac19e011247899acc9a11d59c4f916cf8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Sat, 7 Oct 2023 00:24:37 -0700
Subject: [PATCH 1/3] Put push logic directly in push if statement

---
 .github/workflows/test_and_publish.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test_and_publish.yaml b/.github/workflows/test_and_publish.yaml
index e28ae84c..f996c1e3 100644
--- a/.github/workflows/test_and_publish.yaml
+++ b/.github/workflows/test_and_publish.yaml
@@ -14,7 +14,6 @@ env:
   FINAL_BASE_IMG_REPO: project8/luna_base
   FINAL_BASE_IMG_TAG: v1.3.3
   NARG: 2
-  DO_DOCKER_PUSH: ${{ github.event_name == 'push' && ( contains(github.ref, 'refs/tags/') || github.ref == 'refs/heads/develop' ) }}
 jobs:
 
   docker-build-and-publish:
@@ -115,7 +114,7 @@ jobs:
 
       - name: Build to Push
         id: build-to-push
-        if: ${{ env.DO_DOCKER_PUSH }}
+        if: github.event_name == 'push' && ( contains(github.ref, 'refs/tags/') || github.ref == 'refs/heads/develop' )
         uses: docker/build-push-action@v5
         with:
           context: .

From 46e9dae2e02d57148fd3103334c3df9cb352e1a0 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Sat, 7 Oct 2023 00:24:52 -0700
Subject: [PATCH 2/3] Updated Nymph to v1.4.9

---
 Nymph | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Nymph b/Nymph
index b39932f6..f2a9754e 160000
--- a/Nymph
+++ b/Nymph
@@ -1 +1 @@
-Subproject commit b39932f61954e2b5f407944a1f4162212f3cf628
+Subproject commit f2a9754e9d681478fb671f9b2d0401c240fbeaf2

From 1761af076d48106d649526fd50d0a28e3e1e6c9f Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Sat, 7 Oct 2023 01:33:59 -0700
Subject: [PATCH 3/3] Use luna_base v1.3.4

---
 .github/workflows/test_and_publish.yaml | 4 ++--
 Dockerfile                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test_and_publish.yaml b/.github/workflows/test_and_publish.yaml
index f996c1e3..69f7a716 100644
--- a/.github/workflows/test_and_publish.yaml
+++ b/.github/workflows/test_and_publish.yaml
@@ -10,9 +10,9 @@ on:
 env:
   REGISTRY: ghcr.io
   BASE_IMG_REPO: project8/luna_base
-  BASE_IMG_TAG: v1.3.3-dev
+  BASE_IMG_TAG: v1.3.4-dev
   FINAL_BASE_IMG_REPO: project8/luna_base
-  FINAL_BASE_IMG_TAG: v1.3.3
+  FINAL_BASE_IMG_TAG: v1.3.4
   NARG: 2
 jobs:
 
diff --git a/Dockerfile b/Dockerfile
index 7c6f5982..ca091822 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 ARG final_img_repo=ghcr.io/project8/luna_base
-ARG final_img_tag=v1.3.3
+ARG final_img_tag=v1.3.4
 
 ARG build_img_repo=ghcr.io/project8/luna_base
-ARG build_img_tag=v1.3.3-dev
+ARG build_img_tag=v1.3.4-dev
 
 ########################
 FROM ${build_img_repo}:${build_img_tag} AS build