Update ARGS to streamline customer delivery

Author: cmaynard-ngwpc

Dockerfile

@@ -1,14 +1,41 @@
 # syntax=docker/dockerfile:1.4
 
-ARG ORG=ngwpc
+############################################################################
+# Change/Verify these values when adopting this Dockerfile into another org:
+#   GH_ORG, GHCR_ORG, IMAGE_NAMESPACE,
+#   EWTS_ORG, EWTS_REF, MSW_MGR_ORG, MSW_MGR_REF
+############################################################################
+
+# Ownership / branding overrides
+ARG GH_ORG=NGWPC
+ARG GHCR_ORG=ngwpc
+ARG IMAGE_NAMESPACE=ngwpc
+
+# External repository sources (org and ref/branch overrides)
+ARG EWTS_ORG=${GH_ORG}
+ARG EWTS_REF=development
+ARG MSW_MGR_ORG=${GH_ORG}
+ARG MSW_MGR_REF=development
+############################################################################
+
+# Image selection
 ARG NGEN_IMAGE_TAG=latest
-ARG NGEN_IMAGE=ghcr.io/${ORG}/ngen:${NGEN_IMAGE_TAG}
+ARG NGEN_IMAGE=ghcr.io/${GHCR_ORG}/ngen:${NGEN_IMAGE_TAG}
 FROM ${NGEN_IMAGE}
 
-# Uncomment when building ngen locally or if ngen-int image is available locally
-# modify to use image tag for local ngen image if needed
+# Uncomment when building ngen locally 
 #FROM ngen
 
+# Re-expose args after FROM for the remaining build stage
+# Keeps whatever value was already set
+ARG GH_ORG
+ARG GHCR_ORG
+ARG IMAGE_NAMESPACE
+ARG EWTS_ORG
+ARG EWTS_REF
+ARG MSW_MGR_ORG
+ARG MSW_MGR_REF
+
 # OCI Metadata Arguments
 ARG NGEN_IMAGE
 ARG BASE_IMAGE_DIGEST="unknown"
@@ -21,12 +48,12 @@ ARG IMAGE_REVISION="unknown"
 # OCI Standard Labels
 LABEL org.opencontainers.image.base.name="${NGEN_IMAGE}" \
     org.opencontainers.image.base.digest="${BASE_IMAGE_DIGEST}" \
-    io.ngwpc.image.base.revision="${BASE_IMAGE_REVISION}" \
+    io.${IMAGE_NAMESPACE}.image.base.revision="${BASE_IMAGE_REVISION}" \
     org.opencontainers.image.source="${IMAGE_SOURCE}" \
     org.opencontainers.image.vendor="${IMAGE_VENDOR}" \
     org.opencontainers.image.version="${IMAGE_VERSION}" \
     org.opencontainers.image.revision="${IMAGE_REVISION}" \
-    org.opencontainers.image.title="NGEN Forecast/Hindcast" \
+    org.opencontainers.image.title="NGEN Forecast/Hindcast Manager" \
     org.opencontainers.image.description="Docker image for the NGEN Forecast/Hindcast application"
 
 # Activate the existing virtual environment
@@ -57,8 +84,7 @@ RUN --mount=type=cache,target=/root/.cache/pip,id=pip-cache \
 # Build args – override at build time to pin a branch, tag, or full commit SHA:
 #   docker build --build-arg EWTS_REF=v1.2.3 ...
 #   docker build --build-arg EWTS_REF=abc123def456 ...
-ARG EWTS_ORG=NGWPC
-ARG EWTS_REF=development
+
 ARG EWTS_CACHE_BUST=1
 
 # Clone nwm-ewts, install the Python package, capture git metadata for
@@ -81,12 +107,11 @@ RUN --mount=type=cache,target=/root/.cache/pip,id=pip-cache \
     rm -rf "${ewts_dir}"
 
 # Install MSWM package
-ARG MSW_MGR_VERSION=development
 ARG MSWM_CACHE_BUST=1
 RUN --mount=type=cache,target=/root/.cache/pip,id=pip-cache \
     set -eux; \
     echo "MSWM cache bust: ${MSWM_CACHE_BUST}" && \
-    pip3 install mswm@git+https://github.com/NGWPC/nwm-msw-mgr.git@${MSW_MGR_VERSION} ; \
+    pip3 install mswm@git+https://github.com/${MSW_MGR_ORG}/nwm-msw-mgr.git@${MSW_MGR_REF} ; \
     pip3 cache purge
 
 # Install into the existing virtual environment without upgrading base packages