updating dockerfile to use common base image (#243)

* updating dockerfile to use common base image

* Update for sonar security concern

* added integration test to github ci

* fixed error in yaml

* docker-compose to docker compose

* updating working directory

* added missing checkout step

* added latest version of anms-core service

* added amp-manager

* moved integration test image creatione

* added volume creation

* using light profile to deploy anms for test

* corrected the networks

* removed wait

* setting compose CMD for volume create

* added back wait to anms compose up

* added timeout

---------

Co-authored-by: David Linko <david.linko@jhuapl.edu>
Co-authored-by: Brian Sipos <brian.sipos@jhuapl.edu>

Author: 3 people

.github/workflows/anms-core.yaml

@@ -30,3 +30,34 @@ jobs:
         run: |
           FAIL_SRC=0
           flake8 src || FAIL_SRC=$?
+  anms-core_integration-test:
+    runs-on: ubuntu-24.04
+    env:
+      ANMS_COMPOSE_OPTS: -f docker-compose.yml --profile light
+      TEST_COMPOSE_OPTS: -f anms-core/integration_test/docker-compose.yml
+      HOST_SOCKDIR: sockdir
+      CTR_SOCKDIR: /var/tmp/nm
+      DOCKER_CMD: docker
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build ANMS
+        run: docker compose ${ANMS_COMPOSE_OPTS} build
+      - name: Build TEST
+        run: docker compose ${TEST_COMPOSE_OPTS} build
+      - name: Build Volume
+        run: |
+          ./create_volume.sh ./puppet/modules/apl_test/files/anms/tls
+          sudo mkdir /run/anms
+      - name: run
+        run: |
+          docker compose  ${ANMS_COMPOSE_OPTS} up -d --force-recreate --wait --wait-timeout 600
+          docker compose ${TEST_COMPOSE_OPTS} run test-fixture
+      - name: after_script
+        run: |
+          if [ "${CI_JOB_STATUS}" = 'failed' ]; then
+            docker logs anms-core
+          fi
+

anms-core/integration_test/Dockerfile

@@ -21,56 +21,22 @@
 ##
 
 # Combine containers for anms-core and its test fixture
-version: '3.9'
+name: anms-integration-test
 
 networks:
-  default:
-    name: ${DOCKER_CTR_PREFIX}anms
-    driver_opts:
-      com.docker.network.bridge.name: br-${DOCKER_CTR_PREFIX}anms
-      com.docker.network.driver.mtu: 65535
+  anms:
+    external: true
+      
 
 services:
   # External dependencies first
-  postgres:
-    hostname: postgres
-    image: ${DOCKER_IMAGE_PREFIX}amp-sql:${DOCKER_IMAGE_TAG}
-    environment:
-      POSTGRES_USER: ${DB_USER}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_DB: ${DB_NAME}
-  mqtt-broker:
-    hostname: mqtt-broker
-    image: ${DOCKER_IMAGE_PREFIX}mqtt-broker:${DOCKER_IMAGE_TAG}
-  transcoder:
-    hostname: transcoder
-    image: ${DOCKER_IMAGE_PREFIX}transcoder:${DOCKER_IMAGE_TAG}
-    depends_on:
-      mqtt-broker:
-        condition: service_healthy
-
-  # anms-core built from *this* working copy (not prebuilt image)
-  anms-core:
-    hostname: anms-core
-    build:
-      context: ..
-    volumes: 
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      postgres:
-        condition: service_healthy
-      mqtt-broker:
-        condition: service_healthy
-    environment:
-      DB_HOST: postgres
-      DB_USER: ${DB_USER}
-      DB_PASSWORD: ${DB_PASSWORD}
-      DB_NAME: ${DB_NAME}
-
   test-fixture:
     hostname: test-fixture
     build:
-      context: .
-    depends_on:
-      anms-core:
-        condition: service_healthy
+      context: ../..
+      dockerfile: anms.Containerfile
+      target: anms-core-integration
+    networks:
+      - anms
+    depends_on:  {}
+    

anms-core/integration_test/docker-compose.yml

@@ -260,6 +260,16 @@ EXPOSE 5555/tcp
 HEALTHCHECK --start-period=10s --interval=60s --timeout=10s --retries=20 \
     CMD ["curl", "-sq", "-o/dev/null", "http://localhost:5555/hello"]
 
+# for anms-core integration test
+FROM yarn-base AS anms-core-integration
+
+# Install node+yarn from upstream
+RUN npm install --ignore-scripts -g newman
+
+COPY anms-core/integration_test /root/
+WORKDIR /root
+CMD ["./run_test.sh"]
+
 
 # Build on more permissive CentOS image
 # Run on RHEL UBI image