Per #1, after guidance from George, modified variable values

dtcenter · Aug 29, 2022 · 718d8f5 · 718d8f5
1 parent 00997c6
commit 718d8f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/jobs/build_docker_image.sh b/.github/jobs/build_docker_image.sh
@@ -16,16 +16,14 @@ 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
 
 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
@@ -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>