Merge remote-tracking branch 'origin/feature/177-ghcr_container_publishing' into 252-deleting-an-adm

Author: David Linko

.env

@@ -15,7 +15,7 @@ COMPOSE_PROFILES=full,dev
 #MQTT_PORT=11883
 
 
-DOCKER_IMAGE_PREFIX=localhost/
+DOCKER_IMAGE_PREFIX=ghcr.io/nasa-ammos/anms/
 DOCKER_IMAGE_TAG=latest
 
 ANMS_VERSION=0

.github/workflows/publish_images.yaml

@@ -5,8 +5,6 @@ on:
   push:
     branches:
     - main
-    # For testing: delete this prior to merging PR
-    - feature/177-ghcr_container_publishing
   release:
     types: [published]
 
@@ -30,11 +28,8 @@ jobs:
 
       - name: Set prefix
         run: |
-          echo "DOCKER_IMAGE_PREFIX=${REGISTRY}/${OWNER,,}/${REPO,,}/" >>${GITHUB_ENV}
-          echo "DBG: owner = ${REGISTRY}"
-          echo "DBG: repo  = ${REPO}"
+          echo "DOCKER_IMAGE_PREFIX=${REGISTRY}/${REPO,,}/" >>${GITHUB_ENV}
         env:
-          OWNER: '${{ github.repository_owner }}'
           REPO: '${{ github.repository }}'
       - name: Set image tag
         id: vars

.github/workflows/puppet.yaml

@@ -47,7 +47,7 @@ jobs:
           bundler-cache: true
 
       - name: Install puppet-lint
-        run: gem install puppet-lint
+        run: gem install puppet-lint -v 4.3.0
 
       - name: Run puppet-lint
         run: puppet-lint puppet --sarif --ignore-paths 'puppet/modules/anms/files/*' > puppet-lint-results.sarif

README.md

@@ -79,7 +79,9 @@ docker stop $(docker ps -q); docker rm $(docker ps --all -q); docker system prun
 
 `./quickstart.sh`
 
-The quickstart script will configure, build, and start the ANMS system for the first time.  See comments in the script for additional details, including optional ENV variables to override default behavior.
+The quickstart script will configure, pull, and start the ANMS system for the first time.  See comments in the script for additional details, including optional ENV variables to override default behavior.
+
+NOTICE: By default, quick start will pull pre-built containers from the github registry (ghcr.io). To force a rebuild, run it as `FORCE_REBULD=y ./quickstart.sh`. See the script header for details.
 
 To stop the system use `podman compose -f testenv-compose.yml -f docker-compose.yml down`.
 
@@ -104,6 +106,7 @@ Choose the appropriate docker, podman or podman-compose commands in the directio
 - Clone this repository recursively (`git clone --recursive https://github.com/NASA-AMMOS/anms.git`)
 - Setup Volume containing PKI configuration (certificate chains and private keys):
   - `./create_volume.sh ./puppet/modules/apl_test/files/anms/tls`
+- OPTIONAL: The next 2 steps  will build all ANMS containers. If desired, these steps can be replaced with 'pull'ing prebuilt containers from ghcr.
 - Build Core Images using one of the following:
   - `docker compose -f docker-compose.yml build`
   - `podman compose -f docker-compose.yml build`
@@ -228,6 +231,8 @@ Refer to the `.env` file for port binding overrides, or `docker-compose.yml` for
 
 ### ANMS-UI is not visible at hostname
 
+Ensure that you are running with the 'full' profile. This is the default option when using the `.env` file, however some older versions of podman-compose may not parse the COMPOSE_PROFILES ENV variable correctly. If this is the case, specify the profile explicitly in your compose up commands. For example, `podman compose --profile full up`.
+
 Check the startup logs for any errors. If using podman, some port numbers may need to be remapped using the `.env` file to higher numbered ports, or the system configuration modified to adjust permissions (not recommended).
 
 If you go to your browser and hostname:9030 (replace hostname with the server's hostname) and you see the ANMS UI,

quickstart.sh

@@ -25,6 +25,9 @@
 # is not specified the #AUTHNZ_* lines in .env will be uncommented to
 # use ports that do not require root permissions.
 #
+# FORCE_BUILD=y  If 'y', all ANMS-specific containers will be built locally.
+#    Otherwise, prebuilt containers will be pulled from ghcr for quicker startup.
+#
 # Note: This script was created with assistance from openai/gpt-oss-120b
 set -e
 
@@ -81,8 +84,12 @@ cp docker-compose.no-security-override.yml docker-compose.override.yml
 ./create_volume.sh ./puppet/modules/apl_test/files/anms/tls
 
 # Build system
-${DOCKER_CMD} compose build
-
+if [[ ${FORCE_BUILD:-} == y ]]; then
+    ${DOCKER_CMD} compose --profile full --profile dev build
+else
+    ${DOCKER_CMD} compose --profile full --profile dev pull
+fi
+    
 # Start testenv (unless disabled)
 if [[ ${USE_TESTENV:-} != n ]]; then
     ${DOCKER_CMD} compose -f testenv-compose.yml up -d