From c46fbcb4767e648fe525114d00ad5f096857f129 Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Thu, 9 May 2024 11:53:32 -0700
Subject: [PATCH] APIGOV-27565 - test1

---
 .github/workflows/build-docker-images.yml | 123 +++++++++++-----------
 1 file changed, 60 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index 2ae9ad2..b9c13ef 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -14,39 +14,38 @@ jobs:
       ORG_NAME: Axway
     runs-on: ubuntu-latest
     steps:
-      - run: echo "foo"
+      - uses: actions/checkout@v4
 
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - name: Create commit_id & version environment variables
-  #       run: |
-  #         commitId=$(git rev-parse --short HEAD)
-  #         echo "commitId=$commitId" >> $GITHUB_ENV
-  #     - name: Log in to the Container registry
-  #       uses: docker/login-action@v3
-  #       with:
-  #         registry: ghcr.io
-  #         username: ${{ github.actor }}
-  #         password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create commit_id & version environment variables
+        run: |
+          commitId=$(git rev-parse --short HEAD)
+          echo "commitId=$commitId" >> $GITHUB_ENV
+      
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-  #     - name: Extract metadata (tags, labels) for Docker
-  #       id: meta
-  #       uses: docker/metadata-action@v5
-  #       with:
-  #         flavor: latest=false
-  #         images: ghcr.io/${{ env.ORG_NAME }}/${{ env.IMAGE_NAME }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          flavor: latest=false
+          images: ghcr.io/${{ env.ORG_NAME }}/${{ env.IMAGE_NAME }}
 
-  #     - name: Build and push Docker image
-  #       uses: docker/build-push-action@v5
-  #       with:
-  #         context: .
-  #         file: build/discovery.Dockerfile
-  #         push: true
-  #         tags: ${{ steps.meta.outputs.tags }}
-  #         labels: ${{ steps.meta.outputs.labels }}
-  #         build-args: |
-  #             VERSION=${{ github.ref_name }}
-  #             COMMIT_ID=${{ env.commitId }}
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: build/discovery.Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+              VERSION=${{ github.ref_name }}
+              COMMIT_ID=${{ env.commitId }}
 
   buildTraceabilityAgentDocker:
     env:
@@ -56,39 +55,38 @@ jobs:
       ORG_NAME: Axway
     runs-on: ubuntu-latest
     steps:
-      - run: echo "bar"
+      - uses: actions/checkout@v4
+      
+      - name: Create commit_id & version environment variables
+        run: |
+          commitId=$(git rev-parse --short HEAD)
+          echo "commitId=$commitId" >> $GITHUB_ENV
+      
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - name: Create commit_id & version environment variables
-  #       run: |
-  #         commitId=$(git rev-parse --short HEAD)
-  #         echo "commitId=$commitId" >> $GITHUB_ENV
-  #     - name: Log in to the Container registry
-  #       uses: docker/login-action@v3
-  #       with:
-  #         registry: ghcr.io
-  #         username: ${{ github.actor }}
-  #         password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          flavor: latest=false
+          images: ghcr.io/${{ env.ORG_NAME }}/${{ env.IMAGE_NAME }}
 
-  #     - name: Extract metadata (tags, labels) for Docker
-  #       id: meta
-  #       uses: docker/metadata-action@v5
-  #       with:
-  #         flavor: latest=false
-  #         images: ghcr.io/${{ env.ORG_NAME }}/${{ env.IMAGE_NAME }}
-
-  #     - name: Build and push Docker image
-  #       uses: docker/build-push-action@v5
-  #       with:
-  #         context: .
-  #         file: build/traceability.Dockerfile
-  #         push: true
-  #         tags: ${{ steps.meta.outputs.tags }}
-  #         labels: ${{ steps.meta.outputs.labels }}
-  #         build-args: | 
-  #             VERSION=${{ github.ref_name }}
-  #             COMMIT_ID=${{ env.commitId }}
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: build/traceability.Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: | 
+              VERSION=${{ github.ref_name }}
+              COMMIT_ID=${{ env.commitId }}
 
   notifyTeamsChannel:
     runs-on: ubuntu-latest
@@ -98,6 +96,5 @@ jobs:
         env:
           TEAMS_WEBHOOK_URL: ${{ secrets.TEAMS_WEBHOOK_URL }}
           TAG: ${{ github.ref_name }}
-        # run: ./release.sh
-        run: "echo HELLO"
+        run: ./release.sh
             
\ No newline at end of file