updated build_and_deploy.yaml

.github/workflows/build_and_deploy.yaml

@@ -41,6 +41,46 @@
 #           dockerfile: ./${{ matrix.service }}/${{ matrix.dockerfile }}
 #           tags: ${{ secrets.DOCKERHUB_USERNAME }}/obsrv-${{ matrix.service }}:${{ github.ref_name }}
 #           push: true
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - dockerfile: ./src/Agent/Dockerfile
+            image: ghcr.io/username/image1
+          - dockerfile: ./src/Dockerfile-dril4net-distribution
+            image: ghcr.io/username/image2
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_PACKAGE_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ matrix.image }}
+
+      - name: Build and push Docker image Drill4Net.Agent.Service
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          file: ${{ matrix.dockerfile }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
 
 name: Obsrv api service build and deploy workflow
 run-name: Workflow run for ${{ github.ref }}
@@ -64,11 +104,13 @@ jobs:
   docker-build:
     needs: check-tag
     if: needs.check-tag.outputs.ALLOWED_TAG == 'True'
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        service: ['api-service', 'command-service']
-        dockerfile: ['Dockerfile', 'Dockerfile']
-    runs-on: ubuntu-latest
+        include:
+        dockerfile: api-service/Dockerfile
+        dockerfile: command-service/Dockerfile
+
     steps:
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -80,11 +122,11 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          dockerfile: ./${{ matrix.service }}/${{ matrix.dockerfile }}
+          file: ${{ matrix.dockerfile }}
           tags: ${{ secrets.DOCKERHUB_USERNAME }}obsrv-${{ matrix.service }}:${{ github.ref_name }}
           push: true
 
-
+     
 
 # aws-deploy:
   #   needs: [check-tag, docker-build]