From 72b6bc588c369c814756c3287d6bc6f1a1e74c87 Mon Sep 17 00:00:00 2001 From: saalim-mushtaq Date: Thu, 8 Aug 2024 10:58:37 +0530 Subject: [PATCH 1/4] fix: update yml and .env files --- .env | 3 ++ .github/workflows/pr_agent_codium.yml | 9 ++++ docker-compose.yml | 77 ++++++++++++++++++++++++++- web-api.env | 2 + 4 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/pr_agent_codium.yml diff --git a/.env b/.env index 76ab8a8..9e964fe 100644 --- a/.env +++ b/.env @@ -10,6 +10,9 @@ EMAIL=joe.doe@mycompany.com WEB_API_DOMAIN=cryptlex-api.mycompany.com DASHBOARD_DOMAIN=cryptlex-app.mycompany.com RELEASE_SERVER_DOMAIN=cryptlex-releases.mycompany.com +ADMIN_PORTAL_DOMAIN=cryptlex-admin.mycompany.com +CUSTOMER_PORTAL_DOMAIN=cryptlex-customer.mycompany.com +RESELLER_PORTAL_DOMAIN=cryptlex-reseller.mycompany.com # filestore - Minio or AWS S3 diff --git a/.github/workflows/pr_agent_codium.yml b/.github/workflows/pr_agent_codium.yml new file mode 100644 index 0000000..25388dd --- /dev/null +++ b/.github/workflows/pr_agent_codium.yml @@ -0,0 +1,9 @@ +name: PR-Agent Workflow + +on: + pull_request: + push: + +jobs: + common_job: + uses: cryptlex/github-actions/jobs/pr_agent.yml@main diff --git a/docker-compose.yml b/docker-compose.yml index fe3b3e4..af91407 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: database: - image: postgres:10.7-alpine + image: postgres:16.3-alpine environment: PGDATA: /var/lib/postgresql/data/pgdata POSTGRES_USER: ${POSTGRES_USER} @@ -55,7 +55,7 @@ services: max-size: "20m" labels: - traefik.enable=false - + reverse-proxy: image: traefik:1.7-alpine command: --api --docker --logLevel=INFO --acme.email=${EMAIL} @@ -150,6 +150,79 @@ services: - traefik.docker.network=cryptlex-on-premise_backend - traefik.port=4200 + admin-portal: + image: cryptlex/admin-portal:latest + depends_on: + - web-api + env_file: web-portals.env + environment: + WEB_API_BASE_URL: https://${WEB_API_DOMAIN} + RELEASE_SERVER_BASE_URL: https://${RELEASE_SERVER_DOMAIN} + + networks: + - backend + restart: unless-stopped + ports: + - 4400 + logging: + driver: "json-file" + options: + max-size: "20m" + labels: + - traefik.backend=cryptlex/cryptlex-admin-portal + - traefik.frontend.rule=Host:${ADMIN_PORTAL_DOMAIN} + - traefik.docker.network=cryptlex-on-premise_backend + - traefik.port=4400 + + customer-portal: + image: cryptlex/customer-portal:latest + depends_on: + - web-api + env_file: web-portals.env + environment: + WEB_API_BASE_URL: https://${WEB_API_DOMAIN} + RELEASE_SERVER_BASE_URL: https://${RELEASE_SERVER_DOMAIN} + + networks: + - backend + restart: unless-stopped + ports: + - 4401 + logging: + driver: "json-file" + options: + max-size: "20m" + labels: + - traefik.backend=cryptlex/cryptlex-customer-portal + - traefik.frontend.rule=Host:${CUSTOMER_PORTAL_DOMAIN} + - traefik.docker.network=cryptlex-on-premise_backend + - traefik.port=4401 + + reseller-portal: + image: cryptlex/reseller-portal:latest + depends_on: + - web-api + env_file: web-portals.env + environment: + WEB_API_BASE_URL: https://${WEB_API_DOMAIN} + RELEASE_SERVER_BASE_URL: https://${RELEASE_SERVER_DOMAIN} + + networks: + - backend + restart: unless-stopped + + ports: + - 4402 + logging: + driver: "json-file" + options: + max-size: "20m" + labels: + - traefik.backend=cryptlex/cryptlex-reseller-portal + - traefik.frontend.rule=Host:${RESELLER_PORTAL_DOMAIN} + - traefik.docker.network=cryptlex-on-premise_backend + - traefik.port=4402 + release-server: image: cryptlex/cryptlex-release-server:latest depends_on: diff --git a/web-api.env b/web-api.env index 9353c9c..b795b12 100644 --- a/web-api.env +++ b/web-api.env @@ -26,4 +26,6 @@ EMAIL_SIGNATURE=

Thanks,
The Company Team

# App metrics #NEW_RELIC_LICENSE_KEY= +GOOGLE_ANALYTICS_KEY=UA-XXXXXXXX-X + From 83d45310388effe0d61b7a02de74b0e2dae4b16a Mon Sep 17 00:00:00 2001 From: saalim-mushtaq Date: Fri, 9 Aug 2024 11:58:49 +0530 Subject: [PATCH 2/4] fix: remove reference to deleted web-portals.env file --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index af91407..6dca995 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -154,7 +154,6 @@ services: image: cryptlex/admin-portal:latest depends_on: - web-api - env_file: web-portals.env environment: WEB_API_BASE_URL: https://${WEB_API_DOMAIN} RELEASE_SERVER_BASE_URL: https://${RELEASE_SERVER_DOMAIN} @@ -178,7 +177,6 @@ services: image: cryptlex/customer-portal:latest depends_on: - web-api - env_file: web-portals.env environment: WEB_API_BASE_URL: https://${WEB_API_DOMAIN} RELEASE_SERVER_BASE_URL: https://${RELEASE_SERVER_DOMAIN} @@ -202,7 +200,6 @@ services: image: cryptlex/reseller-portal:latest depends_on: - web-api - env_file: web-portals.env environment: WEB_API_BASE_URL: https://${WEB_API_DOMAIN} RELEASE_SERVER_BASE_URL: https://${RELEASE_SERVER_DOMAIN} From fc186b6b3a65477d545032f2d7441dc3a50fc54f Mon Sep 17 00:00:00 2001 From: saalim-mushtaq Date: Wed, 18 Sep 2024 17:32:58 +0530 Subject: [PATCH 3/4] fix: added codium-pr-agent workflow --- .github/workflows/codium_pr_agent.yml | 13 +++++++++++++ .github/workflows/pr-agent.yml | 18 ------------------ .github/workflows/pr_agent_codium.yml | 9 --------- 3 files changed, 13 insertions(+), 27 deletions(-) create mode 100644 .github/workflows/codium_pr_agent.yml delete mode 100644 .github/workflows/pr-agent.yml delete mode 100644 .github/workflows/pr_agent_codium.yml diff --git a/.github/workflows/codium_pr_agent.yml b/.github/workflows/codium_pr_agent.yml new file mode 100644 index 0000000..a078b3a --- /dev/null +++ b/.github/workflows/codium_pr_agent.yml @@ -0,0 +1,13 @@ +name: Codium PR Agent Workflow + +on: + pull_request: + types: [opened, reopened, ready_for_review] + issue_comment: + +jobs: + call-workflow: + uses: cryptlex/github-actions/.github/workflows/codium_pr_agent.yml@main + secrets: inherit + + diff --git a/.github/workflows/pr-agent.yml b/.github/workflows/pr-agent.yml deleted file mode 100644 index 443973b..0000000 --- a/.github/workflows/pr-agent.yml +++ /dev/null @@ -1,18 +0,0 @@ -on: - pull_request: - issue_comment: -jobs: - pr_agent_job: - runs-on: ubuntu-latest - permissions: - issues: write - pull-requests: write - contents: write - name: Run pr agent on every pull request, respond to user comments - steps: - - name: PR Agent action step - id: pragent - uses: Codium-ai/pr-agent@main - env: - OPENAI_KEY: ${{ secrets.OPEN_AI_KEY }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/pr_agent_codium.yml b/.github/workflows/pr_agent_codium.yml deleted file mode 100644 index 25388dd..0000000 --- a/.github/workflows/pr_agent_codium.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: PR-Agent Workflow - -on: - pull_request: - push: - -jobs: - common_job: - uses: cryptlex/github-actions/jobs/pr_agent.yml@main From 012da96be1836c5422ce76b754fbd616e5bce578 Mon Sep 17 00:00:00 2001 From: saalim-mushtaq Date: Wed, 25 Sep 2024 16:27:33 +0530 Subject: [PATCH 4/4] fix: removed unnecessary spaces and added domains for admin portal, customer portal, and reseller portal --- .env | 6 +++--- docker-compose.yml | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 9e964fe..1620733 100644 --- a/.env +++ b/.env @@ -10,9 +10,9 @@ EMAIL=joe.doe@mycompany.com WEB_API_DOMAIN=cryptlex-api.mycompany.com DASHBOARD_DOMAIN=cryptlex-app.mycompany.com RELEASE_SERVER_DOMAIN=cryptlex-releases.mycompany.com -ADMIN_PORTAL_DOMAIN=cryptlex-admin.mycompany.com -CUSTOMER_PORTAL_DOMAIN=cryptlex-customer.mycompany.com -RESELLER_PORTAL_DOMAIN=cryptlex-reseller.mycompany.com +ADMIN_PORTAL_DOMAIN=admin-portal.mycompany.com +CUSTOMER_PORTAL_DOMAIN=customer-portal.mycompany.com +RESELLER_PORTAL_DOMAIN=reseller-portal.mycompany.com # filestore - Minio or AWS S3 diff --git a/docker-compose.yml b/docker-compose.yml index 6dca995..ac0cf67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -157,7 +157,6 @@ services: environment: WEB_API_BASE_URL: https://${WEB_API_DOMAIN} RELEASE_SERVER_BASE_URL: https://${RELEASE_SERVER_DOMAIN} - networks: - backend restart: unless-stopped @@ -180,7 +179,6 @@ services: environment: WEB_API_BASE_URL: https://${WEB_API_DOMAIN} RELEASE_SERVER_BASE_URL: https://${RELEASE_SERVER_DOMAIN} - networks: - backend restart: unless-stopped @@ -203,11 +201,9 @@ services: environment: WEB_API_BASE_URL: https://${WEB_API_DOMAIN} RELEASE_SERVER_BASE_URL: https://${RELEASE_SERVER_DOMAIN} - networks: - backend restart: unless-stopped - ports: - 4402 logging: