From 718d8f5f1a9c73cad3b8a520a36cb6143f8c2aa5 Mon Sep 17 00:00:00 2001
From: Julie Prestopnik <jpresto@ucar.edu>
Date: Mon, 29 Aug 2022 14:12:32 -0600
Subject: [PATCH] Per #1, after guidance from George, modified variable values

---
 .github/jobs/build_docker_image.sh | 4 +---
 Dockerfile.unit_test_env           | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/jobs/build_docker_image.sh b/.github/jobs/build_docker_image.sh
index 1721c3d..195289e 100755
--- a/.github/jobs/build_docker_image.sh
+++ b/.github/jobs/build_docker_image.sh
@@ -16,8 +16,6 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
-MET_BASE_UNIT_TEST_IMAGE=${GITHUB_TAG}
-
 DOCKERHUB_TAG_UNIT_TEST=${DOCKERHUB_UNIT_TEST_REPO}:${GITHUB_TAG}
 
 DOCKERFILE_PATH=${GITHUB_WORKSPACE}/Dockerfile.unit_test_env
@@ -25,7 +23,7 @@ DOCKERFILE_PATH=${GITHUB_WORKSPACE}/Dockerfile.unit_test_env
 CMD_LOGFILE=${GITHUB_WORKSPACE}/docker_build_unit_test_env.log
 
 time_command docker build -t ${DOCKERHUB_TAG_UNIT_TEST} \
-    --build-arg MET_BASE_UNIT_TEST_IMAGE=${MET_BASE_UNIT_TEST_IMAGE} \
+    --build-arg MET_BASE_IMAGE=${MET_BASE_IMAGE} \
     -f $DOCKERFILE_PATH ${GITHUB_WORKSPACE}
 if [ $? != 0 ]; then
   cat ${GITHUB_WORKSPACE}/docker_build_unit_test_env.log
diff --git a/Dockerfile.unit_test_env b/Dockerfile.unit_test_env
index e60e82a..0ac86e1 100644
--- a/Dockerfile.unit_test_env
+++ b/Dockerfile.unit_test_env
@@ -1,7 +1,6 @@
-ARG MET_BASE_UNIT_TEST_IMAGE
+ARG MET_BASE_IMAGE
 
-#FROM dtcenter/met-base-unit-test:${MET_BASE_UNIT_TEST_IMAGE}
-FROM dtcenter/met-base-unit-test
+FROM dtcenter/met-base:${MET_BASE_IMAGE}
 
 MAINTAINER John Halley Gotway <johnhg@ucar.edu>