From 2b8e366277b5fd258429e81a37f6e4a77db5d3f8 Mon Sep 17 00:00:00 2001
From: Sahil Malhotra <smalhotra@mitre.org>
Date: Wed, 2 Nov 2022 13:59:19 -0400
Subject: [PATCH 1/2] main/dev ci-cd changes

---
 .github/pull_request_template.md    | 16 ++++++++++++++++
 .github/workflows/docker-cd-dev.yml | 26 ++++++++++++++++++++++++++
 .github/workflows/docker-cd.yml     |  2 +-
 .github/workflows/docker-ci.yml     |  2 +-
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 .github/pull_request_template.md
 create mode 100644 .github/workflows/docker-cd-dev.yml

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..d52b4d08
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,16 @@
+## Describe your changes
+
+Please include a summary of the changes and the related issue/task. Please also include relevant motivation and context. List any dependencies that are required for this change, including links to other pull requests/branches in other repositories if applicable.
+
+## Issue ticket number and Jira link
+
+Please include the Jira Ticket Number and Link for this issue/task.
+
+## Checklist before requesting a review
+- [ ] I have performed a self-review of my code
+- [ ] Ensure the target / base branch for any feature PR is set to `dev` not main (the only exception to this is releases from `dev` and hotfix branches)
+
+## Workflow 
+
+Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you. 
+
diff --git a/.github/workflows/docker-cd-dev.yml b/.github/workflows/docker-cd-dev.yml
new file mode 100644
index 00000000..28b2157a
--- /dev/null
+++ b/.github/workflows/docker-cd-dev.yml
@@ -0,0 +1,26 @@
+name: Docker Development Image CD
+
+on:
+  push:
+    branches: [ dev ]
+  workflow_dispatch:
+
+jobs:
+  docker-cd: 
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+      
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_TOKEN }}
+      
+    - name: Build and push Server Docker image
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        push: true
+        tags: codexrems/crd-request-generator:REMSvCurrent
diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml
index a211087a..811cc6d1 100644
--- a/.github/workflows/docker-cd.yml
+++ b/.github/workflows/docker-cd.yml
@@ -2,7 +2,7 @@ name: Docker Image CD
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index f2ee2142..8b057418 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -2,7 +2,7 @@ name: Docker Image CI
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main, dev ]
   workflow_dispatch:
 
 

From 4bf61af9fbad7f283599ebd829ab812e38ec1f48 Mon Sep 17 00:00:00 2001
From: Sahil Malhotra <smalhotra@mitre.org>
Date: Thu, 10 Nov 2022 14:48:13 -0500
Subject: [PATCH 2/2] pr template updates

---
 .github/pull_request_template.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d52b4d08..f586c03d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -10,6 +10,10 @@ Please include the Jira Ticket Number and Link for this issue/task.
 - [ ] I have performed a self-review of my code
 - [ ] Ensure the target / base branch for any feature PR is set to `dev` not main (the only exception to this is releases from `dev` and hotfix branches)
 
+## Checklist for conducting a review
+- [ ] Review the code changes and make sure they all make sense and are necessary. 
+- [ ] Pull the PR branch locally and test by running through workflow and making sure everything works as it is supposed to. 
+
 ## Workflow 
 
 Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you.