From 4d27744add2318874b599415056b8302710cd0f7 Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 10:45:34 -0600 Subject: [PATCH 01/14] updated --- sources/packages/forms/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/packages/forms/Dockerfile b/sources/packages/forms/Dockerfile index fe5a1dc2f6..560a2b0856 100644 --- a/sources/packages/forms/Dockerfile +++ b/sources/packages/forms/Dockerfile @@ -48,7 +48,7 @@ RUN ln -sf $NPM_PACKAGES/node_modules node_modules ENV DEBUG="" RUN set -x \ - && chmod -R 777 /app/ + && chmod -R 764 /app/ # This will initialize the application based on # some questions to the user (login email, password, etc.) From a4fdac2e3597714c484217d4c55259cf5e4bb866 Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 10:51:41 -0600 Subject: [PATCH 02/14] updated --- sources/packages/forms/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/packages/forms/Dockerfile b/sources/packages/forms/Dockerfile index 560a2b0856..acc187da74 100644 --- a/sources/packages/forms/Dockerfile +++ b/sources/packages/forms/Dockerfile @@ -48,7 +48,7 @@ RUN ln -sf $NPM_PACKAGES/node_modules node_modules ENV DEBUG="" RUN set -x \ - && chmod -R 764 /app/ + && chmod -R 754 /app/ # This will initialize the application based on # some questions to the user (login email, password, etc.) From 44ce0d6bb19ac93137fb0eac1d6399931407bd6d Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 11:05:26 -0600 Subject: [PATCH 03/14] updated --- sources/packages/forms/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/packages/forms/Dockerfile b/sources/packages/forms/Dockerfile index acc187da74..560a2b0856 100644 --- a/sources/packages/forms/Dockerfile +++ b/sources/packages/forms/Dockerfile @@ -48,7 +48,7 @@ RUN ln -sf $NPM_PACKAGES/node_modules node_modules ENV DEBUG="" RUN set -x \ - && chmod -R 754 /app/ + && chmod -R 764 /app/ # This will initialize the application based on # some questions to the user (login email, password, etc.) From 4e77b09b0fc8b7499db4d4ff0fc553f32a433507 Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 11:10:56 -0600 Subject: [PATCH 04/14] updated --- sources/packages/forms/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/packages/forms/Dockerfile b/sources/packages/forms/Dockerfile index 560a2b0856..f668c5b094 100644 --- a/sources/packages/forms/Dockerfile +++ b/sources/packages/forms/Dockerfile @@ -48,7 +48,7 @@ RUN ln -sf $NPM_PACKAGES/node_modules node_modules ENV DEBUG="" RUN set -x \ - && chmod -R 764 /app/ + && chmod -R 766 /app/ # This will initialize the application based on # some questions to the user (login email, password, etc.) From b53e1045489877c8c37702dbf236f015964d4d17 Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 11:15:40 -0600 Subject: [PATCH 05/14] updated --- sources/packages/forms/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/packages/forms/Dockerfile b/sources/packages/forms/Dockerfile index f668c5b094..fe5a1dc2f6 100644 --- a/sources/packages/forms/Dockerfile +++ b/sources/packages/forms/Dockerfile @@ -48,7 +48,7 @@ RUN ln -sf $NPM_PACKAGES/node_modules node_modules ENV DEBUG="" RUN set -x \ - && chmod -R 766 /app/ + && chmod -R 777 /app/ # This will initialize the application based on # some questions to the user (login email, password, etc.) From 0347d467b622b6269c4239e78394bce93e44857c Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 11:25:39 -0600 Subject: [PATCH 06/14] updated --- sources/packages/forms/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/packages/forms/Dockerfile b/sources/packages/forms/Dockerfile index fe5a1dc2f6..13b0426b39 100644 --- a/sources/packages/forms/Dockerfile +++ b/sources/packages/forms/Dockerfile @@ -48,7 +48,7 @@ RUN ln -sf $NPM_PACKAGES/node_modules node_modules ENV DEBUG="" RUN set -x \ - && chmod -R 777 /app/ + && chmod -R 770 /app/ # This will initialize the application based on # some questions to the user (login email, password, etc.) From 5b0d5a91f57d273601d9afbc6853f1e26d7d9487 Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 12:50:28 -0600 Subject: [PATCH 07/14] updated --- .../env-setup-build-forms-server.yml | 45 +++++++++++++++++++ ....yml => env-setup-deploy-forms-server.yml} | 19 +++----- 2 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/env-setup-build-forms-server.yml rename .github/workflows/{env-setup-build-deploy-forms-server.yml => env-setup-deploy-forms-server.yml} (72%) diff --git a/.github/workflows/env-setup-build-forms-server.yml b/.github/workflows/env-setup-build-forms-server.yml new file mode 100644 index 0000000000..43f092d982 --- /dev/null +++ b/.github/workflows/env-setup-build-forms-server.yml @@ -0,0 +1,45 @@ +name: Env Setup - Build Forms Server +run-name: Env Setup - Build forms server from ${{ inputs.gitRef }}(form.io tag ${{ inputs.formioTag }}) to ${{ inputs.environment }} + +on: + workflow_dispatch: + inputs: + formioTag: + description: "Formio tag, please refer https://github.com/formio/formio/tags to deploy the appropriate tag." + type: string + required: true + default: "v2.5.3" + gitRef: + description: "Git Ref" + required: true + default: "" + +jobs: + build: + name: Build Forms Server + runs-on: ubuntu-latest + env: + FORMIO_SOURCE_REPO_TAG: ${{ inputs.formioTag }} + BUILD_REF: ${{ inputs.formioTag }} + BUILD_NAMESPACE: 0c27fb-tools + steps: + - name: Print env + run: | + echo BUILD NAMESPACE: $BUILD_NAMESPACE + echo BRANCH: $BUILD_REF + # Checkout the PR branch + - name: Checkout Target Branch + uses: actions/checkout@v3 + with: + ref: ${{ inputs.gitRef }} + # Log in to OpenShift. + # Note: The secrets needed to log in are NOT available if the PR comes from a FORK. + # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail. + - name: Log in to OpenShift + run: | + oc login --token=${{ secrets.SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443 + # Build Forms + - name: Build Forms server + working-directory: "./devops/" + run: | + make oc-build-forms diff --git a/.github/workflows/env-setup-build-deploy-forms-server.yml b/.github/workflows/env-setup-deploy-forms-server.yml similarity index 72% rename from .github/workflows/env-setup-build-deploy-forms-server.yml rename to .github/workflows/env-setup-deploy-forms-server.yml index c4bd43716b..a0671cacb3 100644 --- a/.github/workflows/env-setup-build-deploy-forms-server.yml +++ b/.github/workflows/env-setup-deploy-forms-server.yml @@ -1,5 +1,5 @@ -name: Env Setup - Build and Deploy Forms Server -run-name: Env Setup - Build and deploy forms server from ${{ inputs.gitRef }}(form.io tag ${{ inputs.formioTag }}) to ${{ inputs.environment }} +name: Env Setup - Deploy Forms Server +run-name: Env Setup - Deploy forms server from ${{ inputs.gitRef }}(form.io tag ${{ inputs.formioTag }}) to ${{ inputs.environment }} on: workflow_dispatch: @@ -19,22 +19,20 @@ on: default: "" jobs: - build_deploy: - name: Build and Deploy Formio Server. + deploy: + name: Deploy Forms Server runs-on: ubuntu-latest environment: ${{ inputs.environment }} env: - FORMIO_SOURCE_REPO_TAG: ${{ inputs.formioTag }} FORMS_NAME: forms NAMESPACE: ${{ secrets.OPENSHIFT_ENV_NAMESPACE }} BUILD_REF: ${{ inputs.formioTag }} HOST_PREFIX: ${{ secrets.HOST_PREFIX }} - MONGODB_URI: ${{ secrets.MONGODB_URI }} - BUILD_NAMESPACE: 0c27fb-tools + FORMIO_ROOT_EMAIL: ${{ secrets.FORMIO_ROOT_EMAIL }} + FORMS_URL: ${{ secrets.FORMS_URL }} steps: - name: Print env run: | - echo BUILD NAMESPACE: $BUILD_NAMESPACE echo NAMESPACE: $NAMESPACE echo BRANCH: $BUILD_REF echo HOST_PREFIX: $HOST_PREFIX @@ -49,11 +47,6 @@ jobs: - name: Log in to OpenShift run: | oc login --token=${{ secrets.SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443 - # Build Forms - - name: Build Forms server - working-directory: "./devops/" - run: | - make oc-build-forms # Deploy Forms - name: Deploy Forms server working-directory: "./devops/" From 8d563a1956226507f84c9233fcb9ae6ce8a296ec Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 13:17:10 -0600 Subject: [PATCH 08/14] updated --- .github/workflows/env-setup-build-forms-server.yml | 2 +- .github/workflows/env-setup-deploy-forms-server.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/env-setup-build-forms-server.yml b/.github/workflows/env-setup-build-forms-server.yml index 43f092d982..5992aa6964 100644 --- a/.github/workflows/env-setup-build-forms-server.yml +++ b/.github/workflows/env-setup-build-forms-server.yml @@ -1,5 +1,5 @@ name: Env Setup - Build Forms Server -run-name: Env Setup - Build forms server from ${{ inputs.gitRef }}(form.io tag ${{ inputs.formioTag }}) to ${{ inputs.environment }} +run-name: Env Setup - Build forms server from ${{ inputs.gitRef }}(form.io tag ${{ inputs.formioTag }}) on: workflow_dispatch: diff --git a/.github/workflows/env-setup-deploy-forms-server.yml b/.github/workflows/env-setup-deploy-forms-server.yml index a0671cacb3..efc5e85260 100644 --- a/.github/workflows/env-setup-deploy-forms-server.yml +++ b/.github/workflows/env-setup-deploy-forms-server.yml @@ -1,5 +1,5 @@ name: Env Setup - Deploy Forms Server -run-name: Env Setup - Deploy forms server from ${{ inputs.gitRef }}(form.io tag ${{ inputs.formioTag }}) to ${{ inputs.environment }} +run-name: Env Setup - Deploy forms server from ${{ inputs.gitRef }} to ${{ inputs.environment }} on: workflow_dispatch: From a5eb61d10ea598156b21af40de9ba4525a16ed6f Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 13:18:41 -0600 Subject: [PATCH 09/14] updated --- .github/workflows/env-setup-deploy-forms-server.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/env-setup-deploy-forms-server.yml b/.github/workflows/env-setup-deploy-forms-server.yml index efc5e85260..a0671cacb3 100644 --- a/.github/workflows/env-setup-deploy-forms-server.yml +++ b/.github/workflows/env-setup-deploy-forms-server.yml @@ -1,5 +1,5 @@ name: Env Setup - Deploy Forms Server -run-name: Env Setup - Deploy forms server from ${{ inputs.gitRef }} to ${{ inputs.environment }} +run-name: Env Setup - Deploy forms server from ${{ inputs.gitRef }}(form.io tag ${{ inputs.formioTag }}) to ${{ inputs.environment }} on: workflow_dispatch: From c6b23e5e26567c2757958ee3190444b7fed9e9d6 Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 13:21:38 -0600 Subject: [PATCH 10/14] updated --- .github/workflows/env-setup-deploy-forms-server.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/env-setup-deploy-forms-server.yml b/.github/workflows/env-setup-deploy-forms-server.yml index a0671cacb3..b8aec782bd 100644 --- a/.github/workflows/env-setup-deploy-forms-server.yml +++ b/.github/workflows/env-setup-deploy-forms-server.yml @@ -30,6 +30,7 @@ jobs: HOST_PREFIX: ${{ secrets.HOST_PREFIX }} FORMIO_ROOT_EMAIL: ${{ secrets.FORMIO_ROOT_EMAIL }} FORMS_URL: ${{ secrets.FORMS_URL }} + MONGODB_URI: ${{ secrets.MONGODB_URI }} steps: - name: Print env run: | From 3a2a49b643e7549670bc0264cd7b5dfa5fe6bf80 Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 13:23:25 -0600 Subject: [PATCH 11/14] updated --- .github/workflows/env-setup-deploy-forms-server.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/env-setup-deploy-forms-server.yml b/.github/workflows/env-setup-deploy-forms-server.yml index b8aec782bd..ed9d6885ec 100644 --- a/.github/workflows/env-setup-deploy-forms-server.yml +++ b/.github/workflows/env-setup-deploy-forms-server.yml @@ -28,8 +28,6 @@ jobs: NAMESPACE: ${{ secrets.OPENSHIFT_ENV_NAMESPACE }} BUILD_REF: ${{ inputs.formioTag }} HOST_PREFIX: ${{ secrets.HOST_PREFIX }} - FORMIO_ROOT_EMAIL: ${{ secrets.FORMIO_ROOT_EMAIL }} - FORMS_URL: ${{ secrets.FORMS_URL }} MONGODB_URI: ${{ secrets.MONGODB_URI }} steps: - name: Print env From 9053a13e8c1c5d7bc2bf11aea19e7c76ec384367 Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 14:20:02 -0600 Subject: [PATCH 12/14] updated --- .github/workflows/env-setup-build-forms-server.yml | 4 +--- .github/workflows/env-setup-deploy-forms-server.yml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/env-setup-build-forms-server.yml b/.github/workflows/env-setup-build-forms-server.yml index 5992aa6964..31c4ea94fb 100644 --- a/.github/workflows/env-setup-build-forms-server.yml +++ b/.github/workflows/env-setup-build-forms-server.yml @@ -21,7 +21,7 @@ jobs: env: FORMIO_SOURCE_REPO_TAG: ${{ inputs.formioTag }} BUILD_REF: ${{ inputs.formioTag }} - BUILD_NAMESPACE: 0c27fb-tools + BUILD_NAMESPACE: ${{ vars.BUILD_NAMESPACE }} steps: - name: Print env run: | @@ -33,8 +33,6 @@ jobs: with: ref: ${{ inputs.gitRef }} # Log in to OpenShift. - # Note: The secrets needed to log in are NOT available if the PR comes from a FORK. - # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail. - name: Log in to OpenShift run: | oc login --token=${{ secrets.SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443 diff --git a/.github/workflows/env-setup-deploy-forms-server.yml b/.github/workflows/env-setup-deploy-forms-server.yml index ed9d6885ec..ad04f0607e 100644 --- a/.github/workflows/env-setup-deploy-forms-server.yml +++ b/.github/workflows/env-setup-deploy-forms-server.yml @@ -45,7 +45,7 @@ jobs: # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail. - name: Log in to OpenShift run: | - oc login --token=${{ secrets.SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443 + oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }} # Deploy Forms - name: Deploy Forms server working-directory: "./devops/" From d65522e05409fba25c77539791230addfece1759 Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 14:20:59 -0600 Subject: [PATCH 13/14] updated --- .github/workflows/env-setup-build-forms-server.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/env-setup-build-forms-server.yml b/.github/workflows/env-setup-build-forms-server.yml index 31c4ea94fb..f99c82f0d1 100644 --- a/.github/workflows/env-setup-build-forms-server.yml +++ b/.github/workflows/env-setup-build-forms-server.yml @@ -35,7 +35,7 @@ jobs: # Log in to OpenShift. - name: Log in to OpenShift run: | - oc login --token=${{ secrets.SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443 + oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }} # Build Forms - name: Build Forms server working-directory: "./devops/" From 3c462ea6c4781e5555dedc7f11214e43d714832c Mon Sep 17 00:00:00 2001 From: Guru-AOT Date: Thu, 8 Jun 2023 14:22:09 -0600 Subject: [PATCH 14/14] updated --- .github/workflows/env-setup-deploy-forms-server.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/env-setup-deploy-forms-server.yml b/.github/workflows/env-setup-deploy-forms-server.yml index ad04f0607e..977c182a3e 100644 --- a/.github/workflows/env-setup-deploy-forms-server.yml +++ b/.github/workflows/env-setup-deploy-forms-server.yml @@ -41,8 +41,6 @@ jobs: with: ref: ${{ inputs.gitRef }} # Log in to OpenShift. - # Note: The secrets needed to log in are NOT available if the PR comes from a FORK. - # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail. - name: Log in to OpenShift run: | oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}