Remove ION from ANMS images

.dockerignore

@@ -0,0 +1,27 @@
+# SCM files
+.git/
+.gitignore
+
+# Ignore IDE/IntelliJ Files
+.idea
+*.iml
+
+# Ignore build files
+node_modules
+/puppet/.modules
+# Ignore Compiled Vue App
+/anms-ui/release
+# Ignore Data Directory
+/anms-ui/logs
+
+# Ignore Other Specific Stuff
+docker-compose.yaml
+Containerfile
+Dockerfile
+Makefile
+.dockerignore
+gl-sast-report.json
+.metrics-dashboard.yml
+*.md
+*.pdf
+*.docx

.env

@@ -7,8 +7,6 @@
 #MQTT_PORT=11883
 
 
-
-DOCKER_CTR_PREFIX=
 DOCKER_IMAGE_PREFIX=localhost/
 DOCKER_IMAGE_TAG=latest
 
@@ -34,8 +32,8 @@ DB_HEALTHCHECK_USER=healthcheck
 DB_HEALTHCHECK_PASSWORD=healthcheck
 
 GRAFANA_CONTAINER_PORT=3000
-GRAFANA_HOST_PORT=${DOCKER_CTR_PREFIX}grafana:${GRAFANA_CONTAINER_PORT}
-GRAFANA_PROXIES_PATH=localhost/${DOCKER_CTR_PREFIX}grafana
+GRAFANA_HOST_PORT=grafana:${GRAFANA_CONTAINER_PORT}
+GRAFANA_PROXIES_PATH=localhost/grafana
 REDIS_PORT=6379
 JS_AMP_PORT=3001
 ANMS_UI_HTTP_PORT=9030
@@ -48,7 +46,7 @@ LOGSTASH_MONITORING_PORT=9600
 KIBANA_PORT=5601
 ADMINER_PORT=8080
 RENDERER_PORT=8081
-RENDERER_HOST_PORT=${DOCKER_CTR_PREFIX}grafana-image-renderer:${RENDERER_PORT}
+RENDERER_HOST_PORT=grafana-image-renderer:${RENDERER_PORT}
 ION_MGR_PORT=8089
 HTTP_PORT=80
 

.github/workflows/build-test.yaml

@@ -36,8 +36,10 @@ jobs:
         run: |
           DOCKER_IMAGE_TAG=$(echo ${{ github.head_ref || github.ref_name }} | sed 's/[^a-zA-Z0-9\-\._]/-/g')
           echo "DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG}" >> $GITHUB_ENV
-      - name: Build Main
-        run: podman compose ${ANMS_COMPOSE_OPTS} build
+      - name: Build ANMS
+        run: |
+          podman compose ${ANMS_COMPOSE_OPTS} build builder-base builder-acelib
+          podman compose ${ANMS_COMPOSE_OPTS} build
       - name: Build Agents
         run: podman compose ${TESTENV_COMPOSE_OPTS} build
       - name: Build Volume
@@ -46,9 +48,10 @@ jobs:
           sudo mkdir /run/anms
       - name: Start
         run: |
-          podman compose ${TESTENV_COMPOSE_OPTS} up -d --force-recreate --wait
+          podman compose ${TESTENV_COMPOSE_OPTS} up -d --force-recreate
           podman compose ${ANMS_COMPOSE_OPTS} up -d --force-recreate --wait
       - name: Status
+        if: always()
         run: |
           for BADSTATUS in stopped restarting; do
             podman compose ${ANMS_COMPOSE_OPTS} ps --services --filter status=${BADSTATUS} | tee -a /tmp/notgood
@@ -97,9 +100,9 @@ jobs:
         run: |
           echo "GITHUB_WORKSPACE=${{ github.workspace }}"
           ls -al ${{ github.workspace }}
-      - name: Build Main
+      - name: Build ANMS
         run: |
-          docker compose ${ANMS_COMPOSE_OPTS} build builder-base builder-init builder-acelib
+          docker compose ${ANMS_COMPOSE_OPTS} build builder-base builder-acelib
           docker compose ${ANMS_COMPOSE_OPTS} build
       - name: Build Agents
         run: docker compose ${TESTENV_COMPOSE_OPTS} build
@@ -109,9 +112,10 @@ jobs:
           sudo mkdir /run/anms
       - name: Start
         run: |
-          docker compose ${TESTENV_COMPOSE_OPTS} up -d --force-recreate --wait
+          docker compose ${TESTENV_COMPOSE_OPTS} up -d --force-recreate
           docker compose ${ANMS_COMPOSE_OPTS} up -d --force-recreate --wait
       - name: Status
+        if: always()
         run: |
           for BADSTATUS in stopped restarting; do
             docker compose ${ANMS_COMPOSE_OPTS} ps --services --filter status=${BADSTATUS} | tee -a /tmp/notgood

README.md

@@ -206,13 +206,11 @@ docker-compose -f testenv-compose.yml up -d --force-recreate
 
 The top-level `docker-compose.yml` uses the environment defined by the sibling file `.env`.  Note: If using the legacy/deprecated build.sh script, that script may additionally override some environment variables.
 
-Two principal options of the compose configuration, which are both defaulted to empty text, are:
+The principal options of the compose configuration are:
 
-* `DOCKER_CTR_PREFIX` which controls any container name prefix added to all ANMS containers.
-  This can be used to disambiguate container names on a shared host (specifically for common container names like `nginx` or `postgres`).
 * `DOCKER_IMAGE_PREFIX` which controls any image name prefix added to all ANMS images.
   For a local build, this can be left empty, but for builds intended to be pushed to a Docker image registry this can be set to the full path on the registry before the image names (e.g. `DOCKER_IMAGE_PREFIX=some.host.example.com:5000/path/to/images`).
-
+* `HOST_SOCKDIR` which controls the source of the bind mount on `amp-manager` container for its transport socket. This can either be a volume name, for inter-container or non-root user use, or an absolute path on the host filesystem, used in the production deployment.
 
 
 ### AMP Database Querying

base.Dockerfile

@@ -39,26 +39,6 @@ ENV APP_USER=anms
 RUN groupadd -r -g 9999 ${APP_USER} && \
     useradd -m -r -g ${APP_USER} -u 9999 ${APP_USER}
 
-
-# This image uses systemd init process to manage local services.
-# Derived image targets choose which servies are enabled.
-#
-FROM registry.access.redhat.com/ubi9/ubi-init:9.2  AS anms-init
-
-# Optional APL network configuration from
-# https://aplprod.servicenowservices.com/sp?id=kb_article&sys_id=c0de6fe91b83d85071b143bae54bcb34
-RUN ( \
-      curl -sL http://apllinuxdepot.jhuapl.edu/linux/APL-root-cert/JHUAPL-MS-Root-CA-05-21-2038-B64-text.cer -o /etc/pki/ca-trust/source/anchors/JHUAPL-MS-Root-CA-05-21-2038-B64-text.crt && \
-      update-ca-trust && \
-      echo "Root CA added" \
-    ) || true
-ENV PIP_CERT=/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
-ENV PIP_DEFAULT_TIMEOUT=300
-RUN dnf -y install container-tools
-# Container service config
-RUN systemctl disable dnf-makecache.timer
-
-
 # This image includes common libraries used by the aricodec and anms-core
 # containers.
 # Sets environment: