Remove inconsistently used DOCKER_CTR_PREFIX variable

Author: BrianSipos

.dockerignore

@@ -6,12 +6,11 @@
 .idea
 *.iml
 
-# Ignore Node Modules used locally
+# Ignore build files
 node_modules
-
+/puppet/.modules
 # Ignore Compiled Vue App
 /anms-ui/release
-
 # Ignore Data Directory
 /anms-ui/logs
 

.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
 

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

docker-compose.yml

@@ -21,17 +21,16 @@
 ##
 
 # This configuration uses the environment variables:
-# DOCKER_CTR_PREFIX to contain a (default empty) container name prefix
 # DOCKER_IMAGE_PREFIX to contain a (default empty) image registry and path to all custom images
 # DOCKER_IMAGE_TAG to contain the image tag for custom images
 #
 name: anms
 
 networks:
   default:
-    name: ${DOCKER_CTR_PREFIX}anms
+    name: anms
     driver_opts:
-      com.docker.network.bridge.name: br-${DOCKER_CTR_PREFIX}anms
+      com.docker.network.bridge.name: br-anms
       com.docker.network.driver.mtu: 65535
 
 volumes:
@@ -128,7 +127,7 @@ services:
 
   postgres:
     hostname: postgres
-    image: ${DOCKER_CTR_PREFIX}refdb-sql:${DOCKER_IMAGE_TAG}
+    image: ${DOCKER_IMAGE_PREFIX}refdb-sql:${DOCKER_IMAGE_TAG}
     build:
       context: deps
       dockerfile: ansmsql.Dockerfile
@@ -291,7 +290,7 @@ services:
 
   amp-manager:
     hostname: amp-manager
-    image: ${DOCKER_CTR_PREFIX}amp-manager:${DOCKER_IMAGE_TAG}
+    image: ${DOCKER_IMAGE_PREFIX}amp-manager:${DOCKER_IMAGE_TAG}
     build:
       context: deps
       dockerfile: reftools.Dockerfile

light-compose.yml

@@ -21,17 +21,16 @@
 ##
 
 # This configuration uses the environment variables:
-# DOCKER_CTR_PREFIX to contain a (default empty) container name prefix
 # DOCKER_IMAGE_PREFIX to contain a (default empty) image registry and path to all custom images
 # DOCKER_IMAGE_TAG to contain the image tag for custom images
 #
 name: anms
 
 networks:
   default:
-    name: ${DOCKER_CTR_PREFIX}anms
+    name: anms
     driver_opts:
-      com.docker.network.bridge.name: br-${DOCKER_CTR_PREFIX}anms
+      com.docker.network.bridge.name: br-anms
       com.docker.network.driver.mtu: 65535
 
 volumes:
@@ -50,18 +49,13 @@ services:
       dockerfile: base.Dockerfile
       target: anms-base
     command: bash -c 'while true; do sleep 1; done' # Dummy loop to simplify dependency management
-  builder-init:
-    image: localhost/anms-init
-    build:
-      dockerfile: base.Dockerfile
-      target: anms-init
-    command: bash -c 'while true; do sleep 1; done' # Dummy loop to simplify dependency management
   builder-acelib:
     image: localhost/dtnma-acelib
     build:
       dockerfile: base.Dockerfile
       target: dtnma-acelib
     command: bash -c 'while true; do sleep 1; done' # Dummy loop to simplify dependency management
+
   authnz:
     image: ${DOCKER_IMAGE_PREFIX}authnz:${DOCKER_IMAGE_TAG}
     build:
@@ -74,8 +68,6 @@ services:
     ports:
       - "${AUTHNZ_PORT:-80}:80"
       - "${AUTHNZ_HTTPS_PORT:-443}:443"
-    depends_on:
-      - builder-base
     environment:
       CAM_SERVER_URL: ${CAM_SERVER_URL}
       CAM_ADMIN_USER: ${CAM_ADMIN_USER}
@@ -113,7 +105,7 @@ services:
 
   postgres:
     hostname: postgres
-    image: ${DOCKER_CTR_PREFIX}refdb-sql:${DOCKER_IMAGE_TAG}
+    image: ${DOCKER_IMAGE_PREFIX}refdb-sql:${DOCKER_IMAGE_TAG}
     build:
       context: deps
       dockerfile: ansmsql.Dockerfile
@@ -156,9 +148,6 @@ services:
     security_opt:
       - "label=type:transcoder.process"
     depends_on:
-      builder-acelib:
-          # Not expected to run, but needed here to ensure build dependency
-        condition: service_started
       mqtt-broker:
         condition: service_healthy
 
@@ -175,9 +164,6 @@ services:
       DB_URI: postgresql://${DB_USER}:${DB_PASSWORD}@postgres/${DB_NAME}
       MQTT_HOST: mqtt-broker
     depends_on:
-      builder-acelib:
-          # Not expected to run, but needed here to ensure build dependency
-        condition: service_started
       postgres:
         condition: service_healthy
       mqtt-broker:
@@ -203,9 +189,6 @@ services:
     ports:
       - "${ANMS_CORE_HTTP_PORT:-5555}:5555"
     depends_on:
-      builder-acelib:
-        # Not expected to run, but needed here to ensure build dependency
-        condition: service_started
       amp-manager:
         condition: service_started
       postgres:
@@ -215,6 +198,7 @@ services:
 
   amp-manager:
     hostname: amp-manager
+    image: ${DOCKER_IMAGE_PREFIX}amp-manager:${DOCKER_IMAGE_TAG}
     build:
       context: deps
       dockerfile: reftools.Dockerfile

puppet/modules/anms/templates/env.epp

@@ -7,8 +7,6 @@
 #MQTT_PORT=11883
 
 
-
-DOCKER_CTR_PREFIX=
 DOCKER_IMAGE_PREFIX=<%= $anms::ctr_image_prefix %>
 DOCKER_IMAGE_TAG=<%= $anms::ctr_image_tag %>
 
@@ -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
 

testenv-compose.yml

@@ -21,17 +21,16 @@
 ##
 
 # This configuration uses the environment variables:
-# DOCKER_CTR_PREFIX to contain a (default empty) container name prefix
 # DOCKER_IMAGE_PREFIX to contain a (default empty) image registry and path to all custom images
 # DOCKER_IMAGE_TAG to contain the image tag for custom images
 #
 name: testenv
 
 networks:
   default:
-    name: ${DOCKER_CTR_PREFIX}testenv
+    name: testenv
     driver_opts:
-      com.docker.network.bridge.name: br-${DOCKER_CTR_PREFIX}testenv
+      com.docker.network.bridge.name: br-testenv
       com.docker.network.driver.mtu: 65535
     ipam:
       config: