From f8c027c142907a32a7e48d9e18e61b0938f70415 Mon Sep 17 00:00:00 2001 From: Ndahimana Bonheur Date: Thu, 5 Dec 2024 15:38:24 +0200 Subject: [PATCH 1/6] Fix:Add API_KEYS --- .github/workflows/docker-image.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 35cc933..10a6c56 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -18,6 +18,7 @@ jobs: PUSHER_SECRET: ${{ secrets.PUSHER_SECRET }} DEVPULSE_EMAIL: ${{ secrets.DEVPULSE_EMAIL }} API_KEY: ${{ secrets.API_KEY }} + API_KEYS: ${{ secrets.API_KEYS }} SENDER_NAME: ${{ secrets.SENDER_NAME }} PORT: ${{ secrets.PORT }} JWT_SECRET: ${{ secrets.JWT_SECRET }} @@ -45,7 +46,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, PUSHER_CLUSTER, PUSHER_APP_ID, PUSHER_KEY, PUSHER_SECRET, API_KEY, SENDER_NAME, DEVPULSE_EMAIL, PORT, JWT_SECRET + 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, API_KEY,API_KEYS, SENDER_NAME, DEVPULSE_EMAIL, PORT, JWT_SECRET script: | touch env @@ -58,6 +59,7 @@ jobs: echo "PUSHER_SECRET=${PUSHER_SECRET}" >> env echo "DEVPULSE_EMAIL=${DEVPULSE_EMAIL}" >> env echo "API_KEY=${API_KEY}" >> env + echo "API_KEYS=${API_KEYS}" >> env echo "SENDER_NAME=${SENDER_NAME}" >> env echo "PORT=${PORT}" >> env echo "JWT_SECRET=${JWT_SECRET}" >> env From 5d0f8bcebb4e71018e7c09650666210ec0de6d05 Mon Sep 17 00:00:00 2001 From: Ndahimana Bonheur Date: Thu, 5 Dec 2024 15:40:48 +0200 Subject: [PATCH 2/6] Fix: Remove whitespaces --- .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 10a6c56..7f27912 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -80,5 +80,4 @@ jobs: if [ -z "$output" ]; then echo "Container failed to start" exit 1 - fi - + fi \ No newline at end of file From 95be1d5944a89b2228d155c48d2ecada09989db0 Mon Sep 17 00:00:00 2001 From: Ndahimana Bonheur Date: Thu, 5 Dec 2024 15:53:51 +0200 Subject: [PATCH 3/6] Fix: Add on Pull Request --- .github/workflows/docker-image.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 7f27912..7e6d933 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 @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest env: MONGO_PROD_DB: ${{ secrets.MONGO_PROD_DB }} - FRONTEND_LINK: "https://applications.devpulse.org" - NODE_ENV: "production" + FRONTEND_LINK: 'https://applications.devpulse.org' + NODE_ENV: 'production' PUSHER_CLUSTER: ${{ secrets.PUSHER_CLUSTER }} PUSHER_APP_ID: ${{ secrets.PUSHER_APP_ID }} PUSHER_KEY: ${{ secrets.PUSHER_KEY }} @@ -20,15 +20,13 @@ jobs: API_KEY: ${{ secrets.API_KEY }} API_KEYS: ${{ secrets.API_KEYS }} SENDER_NAME: ${{ secrets.SENDER_NAME }} - PORT: ${{ secrets.PORT }} + PORT: ${{ secrets.PORT }} JWT_SECRET: ${{ secrets.JWT_SECRET }} - steps: - name: Checkout code uses: actions/checkout@v3 - - name: Build and push Docker image uses: mr-smithers-excellent/docker-build-push@v6 with: @@ -80,4 +78,4 @@ jobs: if [ -z "$output" ]; then echo "Container failed to start" exit 1 - fi \ No newline at end of file + fi From 43edbc2dfb25d6076c674e046ca531097ac3a890 Mon Sep 17 00:00:00 2001 From: Ndahimana Bonheur Date: Thu, 5 Dec 2024 16:05:37 +0200 Subject: [PATCH 4/6] Fix: Hardcode API_KEYS --- .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 7e6d933..eab1520 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -12,13 +12,13 @@ jobs: MONGO_PROD_DB: ${{ secrets.MONGO_PROD_DB }} FRONTEND_LINK: 'https://applications.devpulse.org' NODE_ENV: 'production' + API_KEYS: 'AIzaSyBU5z6pbcukcZsjT2EAlr8wHHwpiegk-tw' PUSHER_CLUSTER: ${{ secrets.PUSHER_CLUSTER }} PUSHER_APP_ID: ${{ secrets.PUSHER_APP_ID }} PUSHER_KEY: ${{ secrets.PUSHER_KEY }} PUSHER_SECRET: ${{ secrets.PUSHER_SECRET }} DEVPULSE_EMAIL: ${{ secrets.DEVPULSE_EMAIL }} API_KEY: ${{ secrets.API_KEY }} - API_KEYS: ${{ secrets.API_KEYS }} SENDER_NAME: ${{ secrets.SENDER_NAME }} PORT: ${{ secrets.PORT }} JWT_SECRET: ${{ secrets.JWT_SECRET }} From f1c4022c196440ff8cd9157f58276dece2ff0fbb Mon Sep 17 00:00:00 2001 From: Ndahimana Bonheur Date: Thu, 5 Dec 2024 16:10:25 +0200 Subject: [PATCH 5/6] Fix:Remove hardcoded --- .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 eab1520..7e6d933 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -12,13 +12,13 @@ jobs: MONGO_PROD_DB: ${{ secrets.MONGO_PROD_DB }} FRONTEND_LINK: 'https://applications.devpulse.org' NODE_ENV: 'production' - API_KEYS: 'AIzaSyBU5z6pbcukcZsjT2EAlr8wHHwpiegk-tw' PUSHER_CLUSTER: ${{ secrets.PUSHER_CLUSTER }} PUSHER_APP_ID: ${{ secrets.PUSHER_APP_ID }} PUSHER_KEY: ${{ secrets.PUSHER_KEY }} PUSHER_SECRET: ${{ secrets.PUSHER_SECRET }} DEVPULSE_EMAIL: ${{ secrets.DEVPULSE_EMAIL }} API_KEY: ${{ secrets.API_KEY }} + API_KEYS: ${{ secrets.API_KEYS }} SENDER_NAME: ${{ secrets.SENDER_NAME }} PORT: ${{ secrets.PORT }} JWT_SECRET: ${{ secrets.JWT_SECRET }} From 0061409d795df266f675b07dc0c6df4d1beae5e6 Mon Sep 17 00:00:00 2001 From: ceelogre Date: Fri, 6 Dec 2024 18:32:23 +0200 Subject: [PATCH 6/6] fix: add only admin email --- .github/workflows/docker-image.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 7e6d933..110d070 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,7 +1,7 @@ name: Docker Build and Deploy on: - pull_request: + push: branches: - develop @@ -10,23 +10,25 @@ jobs: runs-on: ubuntu-latest env: MONGO_PROD_DB: ${{ secrets.MONGO_PROD_DB }} - FRONTEND_LINK: 'https://applications.devpulse.org' - NODE_ENV: 'production' + FRONTEND_LINK: "https://applications.devpulse.org" + NODE_ENV: ${{secrets.NODE_ENV}} PUSHER_CLUSTER: ${{ secrets.PUSHER_CLUSTER }} PUSHER_APP_ID: ${{ secrets.PUSHER_APP_ID }} PUSHER_KEY: ${{ secrets.PUSHER_KEY }} PUSHER_SECRET: ${{ secrets.PUSHER_SECRET }} DEVPULSE_EMAIL: ${{ secrets.DEVPULSE_EMAIL }} API_KEY: ${{ secrets.API_KEY }} - API_KEYS: ${{ secrets.API_KEYS }} SENDER_NAME: ${{ secrets.SENDER_NAME }} - PORT: ${{ secrets.PORT }} + PORT: ${{ secrets.PORT }} JWT_SECRET: ${{ secrets.JWT_SECRET }} + ADMIN_EMAIL: ${{ secrets.ADMIN_EMAIL }} + steps: - name: Checkout code uses: actions/checkout@v3 + - name: Build and push Docker image uses: mr-smithers-excellent/docker-build-push@v6 with: @@ -44,7 +46,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, PUSHER_CLUSTER, PUSHER_APP_ID, PUSHER_KEY, PUSHER_SECRET, API_KEY,API_KEYS, SENDER_NAME, DEVPULSE_EMAIL, PORT, JWT_SECRET + envs: MONGO_PROD_DB,REGISTER_FRONTEND_URL,REGISTER_ORG_FRONTEND_URL,NODE_ENV,FRONTEND_LINK,ADMIN_EMAIL,COORDINATOR_EMAIL,COORDINATOR_PASS,GH_TOKEN, PUSHER_CLUSTER, PUSHER_APP_ID, PUSHER_KEY, PUSHER_SECRET, API_KEY, SENDER_NAME, DEVPULSE_EMAIL, PORT, JWT_SECRET script: | touch env @@ -57,7 +59,6 @@ jobs: echo "PUSHER_SECRET=${PUSHER_SECRET}" >> env echo "DEVPULSE_EMAIL=${DEVPULSE_EMAIL}" >> env echo "API_KEY=${API_KEY}" >> env - echo "API_KEYS=${API_KEYS}" >> env echo "SENDER_NAME=${SENDER_NAME}" >> env echo "PORT=${PORT}" >> env echo "JWT_SECRET=${JWT_SECRET}" >> env @@ -79,3 +80,4 @@ jobs: echo "Container failed to start" exit 1 fi +