Making changes to mqtt image to ensure latest image with code changes…

… is built and used in docker compose
MukuFlash03 · Jul 19, 2024 · fa60246 · fa60246
1 parent 6ac9eb3
commit fa60246
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
@@ -114,7 +114,6 @@ jobs:
         run: |
           echo "TAG=${{ steps.docker-image-version-check.outputs.TAG }}"
           docker save --output /tmp/mqtt-server_${{ steps.docker-image-version-check.outputs.TAG }}.tar ghcr.io/everest/everest-demo/mqtt-server:${{ steps.docker-image-version-check.outputs.TAG }}
-          # docker save ghcr.io/everest/everest-demo/mqtt-server:${{ steps.docker-image-version-check.outputs.TAG }} | gzip > mqtt-server_${{ steps.docker-image-version-check.outputs.TAG }}.tar.gz
       
       - name: Upload mqtt-server image as Artifact
         if: ${{ matrix.image_name == 'mqtt-server' }}
@@ -130,7 +129,6 @@ jobs:
         with:
           name: mqtt_server_image_${{ steps.docker-image-version-check.outputs.TAG }}
           path: /tmp
-          # path: mqtt-server_${{ steps.docker-image-version-check.outputs.TAG }}.tar
 
       - name: Load Docker image
         if: ${{ matrix.image_name == 'manager' }}
@@ -139,7 +137,6 @@ jobs:
         run: |
           docker load --input /tmp/mqtt-server_${{ steps.docker-image-version-check.outputs.TAG }}.tar
           docker image ls -a          
-          # docker load --input mqtt-server_${{ steps.docker-image-version-check.outputs.TAG }}.tar
     
       - name: Run automated tests using docker-compose.automated-tests.yml
         if: ${{ matrix.image_name == 'manager' }}

diff --git a/docker-compose.automated-tests.yml b/docker-compose.automated-tests.yml
@@ -5,6 +5,8 @@ services:
     image: ghcr.io/everest/everest-demo/mqtt-server:${TAG}
     logging:
       driver: none
+    working_dir: /mosquitto/config/
+    entrypoint: "sh ./run-test.sh"
 
   manager:
     image: ghcr.io/everest/everest-demo/manager:${TAG}

diff --git a/mosquitto/Dockerfile b/mosquitto/Dockerfile
@@ -2,4 +2,6 @@ FROM eclipse-mosquitto:2.0.10
 
 COPY mosquitto.conf /mosquitto/config/mosquitto.conf
 
+COPY run-test.sh /mosquitto/config/run-test.sh
+
 LABEL org.opencontainers.image.source=https://github.com/everest/everest-demo
diff --git a/mosquitto/run-test.sh b/mosquitto/run-test.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+cat mosquitto.conf