mcode · smalho01 · Nov 1, 2022 · Nov 1, 2022 · Nov 1, 2022 · Nov 1, 2022
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -12,5 +12,5 @@ Please include the Jira Ticket Number and Link for this issue/task.
 
 ## 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. 
+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
@@ -24,4 +24,4 @@ jobs:
       with:
         context: .
         push: true
-        tags: codexrems/rems:REMSvDevelopment
+        tags: codexrems/rems-administrator:REMSvDevelopment
diff --git 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:
@@ -24,4 +24,4 @@ jobs:
       with:
         context: .
         push: true
-        tags: codexrems/rems:REMSvCurrent
+        tags: codexrems/rems-administrator:REMSvCurrent
diff --git 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, dev ]
+    branches: [ main, dev ]
   workflow_dispatch:
 
 

diff --git a/.github/workflows/porter-cd.yml b/.github/workflows/porter-cd.yml
@@ -2,7 +2,7 @@ name: Porter Invocation Docker Image CD
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/porter-ci.yml b/.github/workflows/porter-ci.yml
@@ -2,7 +2,7 @@ name: Porter Invocation Docker Image CI
 
 on:
   pull_request:
-    branches: [ master, dev ]
+    branches: [ main, dev ]
   workflow_dispatch:
 
 

diff --git a/.github/workflows/porter-windows-cd.yml b/.github/workflows/porter-windows-cd.yml
@@ -2,7 +2,7 @@ name: Porter Windows Docker Image CD
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/porter-windows-ci.yml b/.github/workflows/porter-windows-ci.yml
@@ -2,7 +2,7 @@ name: Porter Windows Docker Image CI
 
 on:
   pull_request:
-    branches: [ master, dev ]
+    branches: [ main, dev ]
   workflow_dispatch:
 
 

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -97,7 +97,7 @@ services:
 
 
   # Create rems container
-  rems: # Name of our service
+  rems-administrator: # Name of our service
     build: 
       context: '.'
       dockerfile: Dockerfile.dev     

diff --git a/docker-compose-porter.yml b/docker-compose-porter.yml
@@ -55,8 +55,8 @@ services:
       - "3005:3005" # Bind port 3000 of host to 3000 of container
 
   # # Create rems container
-  rems: # Name of our service
-    image: codexrems/rems:REMSvCurrent
+  rems-administrator: # Name of our service
+    image: codexrems/rems-administrator:REMSvCurrent
     container_name: rems_porter_rems
     ports: # Port binding to host from docker container
       - "9015:9015" # Bind port 3000 of host to 3000 of container

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -56,8 +56,8 @@ services:
       - "3005:3005" # Bind port 3000 of host to 3000 of container
 
   # # Create rems container
-  rems: # Name of our service
-    image: codexrems/rems:REMSvCurrent
+  rems-administrator: # Name of our service
+    image: codexrems/rems-administrator:REMSvCurrent
     container_name: rems_prod_rems
     ports: # Port binding to host from docker container
       - "9015:9015" # Bind port 3000 of host to 3000 of container
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,5 +12,5 @@ Please include the Jira Ticket Number and Link for this issue/task.

		## 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.
		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.
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Porter Invocation Docker Image CD @@
     on:
       push:
-        branches: [ master ]
+        branches: [ main ]
       workflow_dispatch:
     jobs:
@@ Expand Down @@