DAS-1708 - Fix names of images built locally.

Makefile

@@ -1,4 +1,4 @@
-.PHONY: install test lint build-image push-image build-test-image test-in-docker run-in-docker
+.PHONY: install test lint build-image build-test-image test-in-docker run-in-docker
 
 install:
 	pip install -r requirements/core.txt -r requirements/dev.txt
@@ -12,9 +12,6 @@ lint:
 build-image:
 	LOCAL_SVCLIB_DIR=${LOCAL_SVCLIB_DIR} bin/build-image
 
-push-image:
-	bin/push-image
-
 build-test-image:
 	bin/build-test-image
 

bin/build-image

@@ -5,7 +5,7 @@ set -e
 # source the .env file if it exists
 [[ -f .env ]] && source .env
 
-image="harmonyservices/netcdf-to-zarr"
+image="ghcr.io/nasa/harmony-netcdf-to-zarr"
 tag=${1:-latest}
 
 if [ -d "deps" ]; then

bin/build-test-image

@@ -2,7 +2,7 @@
 
 set -e
 
-test_image="harmonyservices/netcdf-to-zarr-tests"
+test_image="ghcr.io/nasa/harmony-netcdf-to-zarr-test"
 tag=${1:-latest}
 
 # We use the `host` network mode so we can have access to the

bin/run-in-docker

@@ -4,7 +4,7 @@
 # It is meant to allow development and testing without repeatedly rebuilding the docker image.  To
 # run a completely clean container using only what is in the image, as will be done in deployed
 # environments, run
-# `docker run --rm -it --env-file=.env harmonyservices/netcdf-to-zarr`
+# `docker run --rm -it --env-file=.env ghcr.io/nasa/harmony-netcdf-to-zarr`
 
 # If the optional environment variable LOCAL_SVCLIB_DIR is set to the directory
 # of a local clone of the `harmony-service-lib-py` repo, it will be mounted
@@ -38,5 +38,5 @@ docker run --rm -it \
   -v $(pwd):/opt/harmony-netcdf-to-zarr \
   ${svclib_volume} \
   --entrypoint= \
-  harmonyservices/netcdf-to-zarr \
+  ghcr.io/nasa/harmony-netcdf-to-zarr \
   bash -c "${cmd}"

bin/run-test

@@ -0,0 +1,25 @@
+#!/bin/bash
+###############################################################################
+# Execute the nasa/harmony-netcdf-to-zarr-test Docker image as a container.
+# This will run the unit test suite and check for Python linting errors.
+#
+# This script will output test coverage information to a `coverage` directory
+# and JUnit test report output to a `test-reports` directory on the host
+# machine executing this script.
+#
+###############################################################################
+
+set -ex
+
+# Make the directory into which XML format test reports will be saved
+mkdir -p test-reports
+
+# Make the directory into which coverage reports will be saved
+mkdir -p coverage
+
+# Run the tests in a Docker container with mounted volumes for XML report
+# output and test coverage reporting
+docker run --rm \
+	-v $(pwd)/test-reports:/home/tests/reports \
+	-v $(pwd)/coverage:/home/tests/coverage \
+	ghcr.io/nasa/harmony-netcdf-to-zarr-test

bin/test-in-docker

@@ -4,7 +4,7 @@
 # suite.  It is meant to allow development and testing without repeatedly rebuilding the docker image.  To
 # run a completely clean container using only what is in the image, as will be done in CI environments,
 # run:
-# `docker run --rm -it --env-file=.env harmonyservices/netcdf-to-zarr-tests`
+# `docker run --rm -it --env-file=.env ghcr.io/nasa/harmony-netcdf-to-zarr-test`
 
 # If the optional environment variable LOCAL_SVCLIB_DIR is set to the directory
 # of a local clone of the `harmony-service-lib-py` repo, it will be mounted
@@ -31,5 +31,5 @@ docker run --rm -it \
   -v $(pwd):/opt/harmony-netcdf-to-zarr \
   ${svclib_volume} \
   --entrypoint= \
-  harmonyservices/netcdf-to-zarr-tests \
+  ghcr.io/nasa/harmony-netcdf-to-zarr-test \
   bash -c "${cmd}"

tests/Dockerfile

@@ -1,5 +1,5 @@
 ARG TAG=latest
-FROM harmonyservices/netcdf-to-zarr:$TAG
+FROM ghcr.io/nasa/harmony-netcdf-to-zarr:$TAG
 
 COPY requirements/core.txt requirements/core.txt