diff --git a/.env b/.env index 76ab8a8..1620733 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=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/.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/docker-compose.yml b/docker-compose.yml index fe3b3e4..ac0cf67 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,72 @@ services: - traefik.docker.network=cryptlex-on-premise_backend - traefik.port=4200 + admin-portal: + image: cryptlex/admin-portal:latest + depends_on: + - web-api + 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 + 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 + 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