From b09655061caccb2b22e83594d1b303d97bcc6178 Mon Sep 17 00:00:00 2001 From: ceelogre Date: Fri, 29 Nov 2024 13:12:42 +0200 Subject: [PATCH 1/8] test: [skip render] create a new container --- .github/workflows/docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 01ee985..85a360d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -51,6 +51,7 @@ jobs: echo "PUSHER_APP_KEY=${PUSHER_APP_KEY}" >> env echo "PUSHER_APP_SECRET=${PUSHER_APP_SECRET}" >> env echo "DEVPULSE_EMAIL=${DEVPULSE_EMAIL}" >> env + echo "Triton@123" >> env # Pull the latest image docker pull ${{ secrets.DOCKER_HUB_USERNAME2 }}/atlp-devpulse-bn:latest From 26847f54a3dfca537060bdeacfe86c97c773a998 Mon Sep 17 00:00:00 2001 From: ceelogre Date: Fri, 29 Nov 2024 13:13:36 +0200 Subject: [PATCH 2/8] test: [skips render] create a new container --- .github/workflows/docker-image.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 85a360d..73649e2 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,7 +1,7 @@ name: Docker Build and Deploy on: - push: + pull_request: branches: - develop @@ -51,7 +51,6 @@ jobs: echo "PUSHER_APP_KEY=${PUSHER_APP_KEY}" >> env echo "PUSHER_APP_SECRET=${PUSHER_APP_SECRET}" >> env echo "DEVPULSE_EMAIL=${DEVPULSE_EMAIL}" >> env - echo "Triton@123" >> env # Pull the latest image docker pull ${{ secrets.DOCKER_HUB_USERNAME2 }}/atlp-devpulse-bn:latest From a05f59462ef841b11f46eae965fee22ea123a0bc Mon Sep 17 00:00:00 2001 From: ceelogre Date: Fri, 29 Nov 2024 13:24:16 +0200 Subject: [PATCH 3/8] test: [skips render] test mkdir --- .github/workflows/docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 73649e2..6f20933 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -43,6 +43,7 @@ jobs: port: ${{ secrets.DO_PORT }} envs: MONGO_PROD_DB,REGISTER_FRONTEND_URL,REGISTER_ORG_FRONTEND_URL,NODE_ENV,FRONTEND_LINK,ADMIN_EMAIL,ADMIN_PASS,COORDINATOR_EMAIL,COORDINATOR_PASS,GH_TOKEN script: | + mkdir shivoh echo "MONGO_PROD_DB=${MONGO_PROD_DB}" > env echo "FRONTEND_LINK=${FRONTEND_LINK}" >> env echo "NODE_ENV=${NODE_ENV}" >> env From 900c09269b3071f9c8dfdb42da313b3d9767b557 Mon Sep 17 00:00:00 2001 From: ceelogre Date: Fri, 29 Nov 2024 13:30:31 +0200 Subject: [PATCH 4/8] test: [skips render] test mkdir --- .github/workflows/docker-image.yml | 4 ++++ Dockerfile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6f20933..c3a9d25 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -43,7 +43,11 @@ jobs: port: ${{ secrets.DO_PORT }} envs: MONGO_PROD_DB,REGISTER_FRONTEND_URL,REGISTER_ORG_FRONTEND_URL,NODE_ENV,FRONTEND_LINK,ADMIN_EMAIL,ADMIN_PASS,COORDINATOR_EMAIL,COORDINATOR_PASS,GH_TOKEN script: | + set -e + set -x + ls -la mkdir shivoh + ls -la echo "MONGO_PROD_DB=${MONGO_PROD_DB}" > env echo "FRONTEND_LINK=${FRONTEND_LINK}" >> env echo "NODE_ENV=${NODE_ENV}" >> env diff --git a/Dockerfile b/Dockerfile index 0546310..cf84bd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,5 +9,5 @@ ARG MONGO_PROD_DB # RUN npm run seed RUN npm run build RUN npm prune --omit=dev -EXPOSE 5000 +EXPOSE 3000 CMD ["node", "dist/index.js"] \ No newline at end of file From 8049eeb87a878bf2b684d41c9d134c0f01b17a49 Mon Sep 17 00:00:00 2001 From: ceelogre Date: Fri, 29 Nov 2024 13:36:34 +0200 Subject: [PATCH 5/8] test: [skips render] check pwd --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c3a9d25..6c2e56f 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -45,7 +45,7 @@ jobs: script: | set -e set -x - ls -la + pwd mkdir shivoh ls -la echo "MONGO_PROD_DB=${MONGO_PROD_DB}" > env From a00047326ad4815443a7c5621fe2143e4f543298 Mon Sep 17 00:00:00 2001 From: ceelogre Date: Fri, 29 Nov 2024 13:43:57 +0200 Subject: [PATCH 6/8] test: [skips render] touch env --- .github/workflows/docker-image.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6c2e56f..9b8242e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -45,9 +45,7 @@ jobs: script: | set -e set -x - pwd - mkdir shivoh - ls -la + touch env echo "MONGO_PROD_DB=${MONGO_PROD_DB}" > env echo "FRONTEND_LINK=${FRONTEND_LINK}" >> env echo "NODE_ENV=${NODE_ENV}" >> env From 7eb06d4c17e1ab6152690e621bf0fc5336aedc1c Mon Sep 17 00:00:00 2001 From: ceelogre Date: Fri, 29 Nov 2024 13:53:07 +0200 Subject: [PATCH 7/8] test: [skips render] remove the cleanup step --- .github/workflows/docker-image.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 9b8242e..9af547a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -68,5 +68,3 @@ jobs: --env-file env \ ${{ secrets.DOCKER_HUB_USERNAME2 }}/atlp-devpulse-bn:latest - # Clean up - rm env From 613c58b8cadef540b4462410983f8f02e7de4e13 Mon Sep 17 00:00:00 2001 From: ceelogre Date: Fri, 29 Nov 2024 14:02:10 +0200 Subject: [PATCH 8/8] test: [skips render] match variables --- .github/workflows/docker-image.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 9af547a..7450752 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -14,8 +14,8 @@ jobs: NODE_ENV: "production" PUSHER_CLUSTER: ${{ secrets.PUSHER_CLUSTER }} PUSHER_APP_ID: ${{ secrets.PUSHER_APP_ID }} - PUSHER_APP_KEY: ${{ secrets.PUSHER_APP_KEY }} - PUSHER_APP_SECRET: ${{ secrets.PUSHER_APP_SECRET }} + PUSHER_KEY: ${{ secrets.PUSHER_KEY }} + PUSHER_SECRET: ${{ secrets.PUSHER_SECRET }} DEVPULSE_EMAIL: ${{ secrets.DEVPULSE_EMAIL }} @@ -41,7 +41,7 @@ jobs: username: ${{ secrets.DO_USERNAME }} key: ${{ secrets.DO_KEY }} port: ${{ secrets.DO_PORT }} - envs: MONGO_PROD_DB,REGISTER_FRONTEND_URL,REGISTER_ORG_FRONTEND_URL,NODE_ENV,FRONTEND_LINK,ADMIN_EMAIL,ADMIN_PASS,COORDINATOR_EMAIL,COORDINATOR_PASS,GH_TOKEN + envs: MONGO_PROD_DB,REGISTER_FRONTEND_URL,REGISTER_ORG_FRONTEND_URL,NODE_ENV,FRONTEND_LINK,ADMIN_EMAIL,ADMIN_PASS,COORDINATOR_EMAIL,COORDINATOR_PASS,GH_TOKEN, PUSHER_CLUSTER, PUSHER_APP_ID, PUSHER_KEY, PUSHER_SECRET script: | set -e set -x @@ -51,8 +51,8 @@ jobs: echo "NODE_ENV=${NODE_ENV}" >> env echo "PUSHER_CLUSTER=${PUSHER_CLUSTER}" >> env echo "PUSHER_APP_ID=${PUSHER_APP_ID}" >> env - echo "PUSHER_APP_KEY=${PUSHER_APP_KEY}" >> env - echo "PUSHER_APP_SECRET=${PUSHER_APP_SECRET}" >> env + echo "PUSHER_KEY=${PUSHER_KEY}" >> env + echo "PUSHER_SECRET=${PUSHER_SECRET}" >> env echo "DEVPULSE_EMAIL=${DEVPULSE_EMAIL}" >> env # Pull the latest image