From d6b9a14cc25279f7395d14b63413d84f4091925b Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 1 Nov 2022 14:58:47 -0400 Subject: [PATCH 1/3] update ci-cd from master to dev --- .github/workflows/docker-cd.yml | 2 +- .github/workflows/docker-ci.yml | 2 +- .github/workflows/porter-cd.yml | 2 +- .github/workflows/porter-ci.yml | 2 +- .github/workflows/porter-windows-cd.yml | 2 +- .github/workflows/porter-windows-ci.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml index aa4068f2..5a62adfd 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 53470896..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, dev ] + branches: [ main, dev ] workflow_dispatch: diff --git a/.github/workflows/porter-cd.yml b/.github/workflows/porter-cd.yml index fa77fdbc..d27736ec 100644 --- 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 index 3fe3f3d3..1de0b909 100644 --- 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 index 033544af..bf44db41 100644 --- 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 index 66f5f1f9..53e9f04c 100644 --- 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: From ca6420aaf1576535b633ec35b12634e8abd96660 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 1 Nov 2022 15:03:49 -0400 Subject: [PATCH 2/3] readme template updates --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 76f4e2d4..99052a59 100644 --- 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. From f5477f3b7a20611763db2e8f1ed5e58a4dae0889 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 1 Nov 2022 15:12:20 -0400 Subject: [PATCH 3/3] cd image name updates --- .github/workflows/docker-cd-dev.yml | 2 +- .github/workflows/docker-cd.yml | 2 +- docker-compose-dev.yml | 2 +- docker-compose-porter.yml | 4 ++-- docker-compose.yml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-cd-dev.yml b/.github/workflows/docker-cd-dev.yml index c1b100ca..5e1ae368 100644 --- 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 index 5a62adfd..dea87690 100644 --- a/.github/workflows/docker-cd.yml +++ b/.github/workflows/docker-cd.yml @@ -24,4 +24,4 @@ jobs: with: context: . push: true - tags: codexrems/rems:REMSvCurrent + tags: codexrems/rems-administrator:REMSvCurrent diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 7db8263f..50968f46 100644 --- 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 index c0e91164..a44ccd4d 100644 --- 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 index abbba636..4ed19355 100644 --- 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