Merge pull request #49 from mcode/main

Update dev to match mains ci-cd workflow

.github/pull_request_template.md

@@ -0,0 +1,20 @@
+## 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)
+
+## 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. 
+

.github/workflows/docker-cd-dev.yml

@@ -9,24 +9,33 @@ jobs:
   docker-cd: 
     runs-on: ubuntu-latest
     steps:
+
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
-          submodules: true
-          
+        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/rems-smart-on-fhir
+        flavor: latest=false
+
     - 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@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
         platforms: linux/amd64,linux/arm64
         push: true
-        tags: codexrems/rems-smart-on-fhir:REMSvExperimental
+        tags: codexrems/rems-smart-on-fhir:experimental
+        labels: ${{ steps.docker-meta-data.outputs.labels }}

.github/workflows/docker-cd.yml

@@ -9,24 +9,33 @@ jobs:
   docker-cd: 
     runs-on: ubuntu-latest
     steps:
+
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
-          submodules: true
-      
+        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/rems-smart-on-fhir
+        flavor: latest=false
+
     - 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@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
         platforms: linux/amd64,linux/arm64
         push: true
-        tags: codexrems/rems-smart-on-fhir:REMSvCurrent
+        tags: codexrems/rems-smart-on-fhir:latest
+        labels: ${{ steps.docker-meta-data.outputs.labels }}

.github/workflows/docker-ci.yml

@@ -12,9 +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 .
+      run: docker build .

.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/rems-smart-on-fhir
-      -
-        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/rems-smart-on-fhir
+        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 }}