Fixes for built-image tag and base-image qualified name (#276)

* Fixes for built-image tag and base-image qualified name

* Update script to capture all images needed

Author: BrianSipos

README.md

@@ -190,7 +190,7 @@ A limitation in the current NM REST API disallows multiple controls in a single
 
 It is recommended to build all containers using the instructions in this document when practical for local deployment.  To support other use cases, all images may also be built once and exported to a tar.gz using standard tools for offline deploments.
 
-The script `export.sh` will create a single .tar.gz file suitable for import by Docker or Podman without requiring access to external resources.
+The script `export.sh` will build or pull all necessary images and create a single .tar.gz file suitable for import by Docker or Podman without requiring access to external resources.
 
 The tar.gz file can be imported using `podman|docker import anms-${VERSION}-images.tar.gz`
 

anms.Containerfile

@@ -72,7 +72,7 @@ COPY deps/dtnma-adms /usr/src/dtnma-adms
 
 
 # This is a postgres stateful database with data definition startup SQL scripts
-FROM postgres:14 AS anms-sql
+FROM docker.io/library/postgres:14 AS anms-sql
 
 COPY deps/anms_db_tables/*.sql /docker-entrypoint-initdb.d/
 COPY deps/dtnma-tools/refdb-sql/postgres/Database_Scripts/*.sql /docker-entrypoint-initdb.d/

docker-compose.yml

@@ -135,7 +135,7 @@ services:
 
   mqtt-broker:
     hostname: mqtt-broker
-    image: ${DOCKER_IMAGE_PREFIX}mqtt-broker
+    image: ${DOCKER_IMAGE_PREFIX}mqtt-broker:${DOCKER_IMAGE_TAG}
     build:
       dockerfile: anms.Containerfile
       target: mqtt-broker

export.sh

@@ -3,10 +3,10 @@
 set -e
 
 GITTAG=$(git describe --always --tags --dirty)
-ANMS_VERSION=${ANMS_VERSION:=${GITTAG}}
+export ANMS_VERSION=${ANMS_VERSION:=${GITTAG}}
+export DOCKER_IMAGE_TAG=${ANMS_VERSION}
 OUTFILE="anms-${ANMS_VERSION}-images.tar.gz"
 
-# Get List of Images
 if command -v podman-compose &> /dev/null; then
     COMPOSE_CMD="podman-compose"
 elif command -v docker-compose &> /dev/null; then
@@ -18,7 +18,13 @@ else
     exit 1
 fi
 
-IMAGES=$(${COMPOSE_CMD} -f docker-compose.yml -f testenv-compose.yml config | grep --color=auto 'image:' | awk '{print $2}' | sort -u | less)
+# Build or pull images needed
+COMPOSE_OPTS="-f docker-compose.yml -f testenv-compose.yml --profile full --profile dev --parallel 1"
+${COMPOSE_CMD} ${COMPOSE_OPTS} --podman-build-args='--format docker' build
+${COMPOSE_CMD} ${COMPOSE_OPTS} pull
+
+# Get List of Images used
+IMAGES=$(${COMPOSE_CMD} ${COMPOSE_OPTS} config | grep --color=auto 'image:' | awk '{print $2}' | sort -u)
 echo "${COMPOSE_CMD} reports the following images: ${IMAGES}"
 
 # Determine base command (docker or podman)