From 6a8de6d67b89b76ef2bbcd7fb8fc31286d9352b3 Mon Sep 17 00:00:00 2001
From: Sahil Malhotra <smalhotra@mitre.org>
Date: Thu, 5 Oct 2023 09:48:29 -0400
Subject: [PATCH] docker ci-cd updates

---
 .github/workflows/docker-cd-dev.yml | 21 +++++++---
 .github/workflows/docker-cd.yml     | 21 +++++++---
 .github/workflows/docker-ci.yml     |  6 ++-
 .github/workflows/docker-tag-cd.yml | 64 ++++++++++++++---------------
 4 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/docker-cd-dev.yml b/.github/workflows/docker-cd-dev.yml
index cb807a3f..ba3d376f 100644
--- a/.github/workflows/docker-cd-dev.yml
+++ b/.github/workflows/docker-cd-dev.yml
@@ -9,12 +9,22 @@ jobs:
   docker-cd: 
     runs-on: ubuntu-latest
     steps:
+
     - name: Checkout Repository
-      uses: actions/checkout@v2
-    
+      uses: actions/checkout@v3
+      with:
+        submodules: true
+
     - name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v2
-      
+
+    - name: Docker meta data
+      id: docker-meta-data
+      uses: docker/metadata-action@v4
+      with:
+        images: codexrems/request-generator
+        flavor: latest=false
+
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
       with:
@@ -22,9 +32,10 @@ jobs:
         password: ${{ secrets.DOCKER_TOKEN }}
       
     - name: Build and push Server Docker image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
         platforms: linux/amd64,linux/arm64
         push: true
-        tags: codexrems/crd-request-generator:REMSvCurrent
+        tags: codexrems/request-generator:experimental
+        labels: ${{ steps.docker-meta-data.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml
index 5a327945..bbf000e8 100644
--- a/.github/workflows/docker-cd.yml
+++ b/.github/workflows/docker-cd.yml
@@ -9,12 +9,22 @@ jobs:
   docker-cd: 
     runs-on: ubuntu-latest
     steps:
+
     - name: Checkout Repository
-      uses: actions/checkout@v2
-      
+      uses: actions/checkout@v3
+      with:
+        submodules: true
+
     - name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v2
-      
+
+    - name: Docker meta data
+      id: docker-meta-data
+      uses: docker/metadata-action@v4
+      with:
+        images: codexrems/request-generator
+        flavor: latest=false
+
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
       with:
@@ -22,9 +32,10 @@ jobs:
         password: ${{ secrets.DOCKER_TOKEN }}
       
     - name: Build and push Server Docker image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
         platforms: linux/amd64,linux/arm64
         push: true
-        tags: codexrems/crd-request-generator:REMSvCurrent
+        tags: codexrems/request-generator:latest
+        labels: ${{ steps.docker-meta-data.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 8b057418..5edae1d3 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -12,7 +12,9 @@ jobs:
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v2
-      
+      uses: actions/checkout@v3
+      with:
+          submodules: true
+
     - name: Test Server Docker image Builds
       run: docker build .
\ No newline at end of file
diff --git a/.github/workflows/docker-tag-cd.yml b/.github/workflows/docker-tag-cd.yml
index a9a19b76..06fb18e9 100644
--- a/.github/workflows/docker-tag-cd.yml
+++ b/.github/workflows/docker-tag-cd.yml
@@ -1,41 +1,41 @@
-name: ci
-
+name: Docker Tagged Image CD
 on:
   workflow_dispatch:
   push:
-    branches:
-      - 'master'
     tags:
-      - 'v*'
-  pull_request:
-    branches:
-      - 'master'
+      - '*'
 
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: codexrems/crd-request-generator
-      -
-        name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+
+    - name: Checkout Repository
+      uses: actions/checkout@v3
+      with:
+        submodules: true
+    
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v2
+        
+    - name: Docker meta data
+      id: docker-meta-data
+      uses: docker/metadata-action@v4
+      with:
+        images: codexrems/request-generator
+        flavor: latest=false
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_TOKEN }}
+
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        push: true
+        platforms: linux/amd64,linux/arm64
+        tags: ${{ steps.docker-meta-data.outputs.tags }}
+        labels: ${{ steps.docker-meta-data.outputs.labels }}