Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #7671

Merged
merged 71 commits into from
Mar 8, 2024
Merged

Release #7671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
ed680d2
fix: improve Redis health check and initialization
evereq Feb 26, 2024
4bc5804
Merge pull request #7578 from ever-co/develop
evereq Feb 26, 2024
4595fdc
fix: tiny improvements in logging for file providers
evereq Feb 26, 2024
05a9385
Merge pull request #7579 from ever-co/develop
evereq Feb 26, 2024
7a8da94
chore: update GitHub actions versions
evereq Feb 26, 2024
5a05a80
Merge pull request #7581 from ever-co/develop
evereq Feb 26, 2024
423057e
chore: builds
evereq Feb 26, 2024
c7fc097
Merge pull request #7583 from ever-co/develop
evereq Feb 26, 2024
81da6eb
chore: switch docker builds to docker driver for APIs
evereq Feb 26, 2024
39009b2
chore(deps): bump es5-ext from 0.10.62 to 0.10.63
dependabot[bot] Feb 26, 2024
b34a841
Merge pull request #7585 from ever-co/dependabot/npm_and_yarn/es5-ext…
evereq Feb 26, 2024
d8b4bb4
Merge pull request #7587 from ever-co/develop
evereq Feb 26, 2024
170d661
refactor: optimized organization team findAll query
rahul-rocket Feb 27, 2024
169df30
fix: create and update organization team APIs
rahul-rocket Feb 27, 2024
0343d33
fix: memberIds not defined
rahul-rocket Feb 27, 2024
810c763
fix: removed console
rahul-rocket Feb 27, 2024
2f71ea0
Merge pull request #7588 from ever-co/fix/organization-team-query-opt…
rahul-rocket Feb 27, 2024
9d79deb
Update Dockerfile
evereq Feb 29, 2024
8b24161
#7589 - Deployment to DO Droplets / Other VMs via SSH (#7591)
evereq Feb 29, 2024
9db3878
chore: fix
evereq Feb 29, 2024
6826f70
chore: fix
evereq Feb 29, 2024
1b8e61f
chore: fix
evereq Feb 29, 2024
f07e97e
chore: fix
evereq Feb 29, 2024
7c185d5
Merge pull request #7630 from ever-co/test-do-droplet2
evereq Feb 29, 2024
de9c883
chore: update deployments to DO App Platform and add to README.md
evereq Feb 29, 2024
bd09b10
fix: #7631 | sticky smart table header
coderNadir Mar 1, 2024
a41d427
Merge pull request #7633 from ever-co/fix/#7631-sticky-header
evereq Mar 1, 2024
e66b19f
Improve 404 Not Found page (#7634)
coderNadir Mar 2, 2024
a37fd90
[Refactor] Tenant / Role Permission Guard (#7644)
rahul-rocket Mar 4, 2024
d1f2f8e
chore: increase RAM limits
evereq Mar 4, 2024
544bd5b
chore: log heap size
evereq Mar 4, 2024
dd18092
feat: add caching to some Middlewares and other improvements
evereq Mar 4, 2024
d0ea45b
Merge pull request #7648 from ever-co/develop
evereq Mar 4, 2024
ab970ba
fix: applied query on organization permission guard
rahul-rocket Mar 5, 2024
7c2f92c
fix(deepscan): removed unused import
rahul-rocket Mar 5, 2024
d2e609b
Merge pull request #7649 from ever-co/fix/organization-permission-guard
rahul-rocket Mar 5, 2024
b7eed06
fix: manual timelog report date wise display
rahul-rocket Mar 5, 2024
fba75c1
fix: added missing prepare SQL query
rahul-rocket Mar 5, 2024
4044708
Merge pull request #7650 from ever-co/fix/manual-timelog-report
rahul-rocket Mar 5, 2024
b8ad35c
Merge pull request #7651 from ever-co/develop
evereq Mar 5, 2024
25b3f72
feat: add more caching to guards & middlewares
evereq Mar 5, 2024
f84d7fa
Merge pull request #7652 from ever-co/develop
evereq Mar 5, 2024
3a5a62b
fix: employee working count query optimization
rahul-rocket Mar 6, 2024
7dff636
fix: improved return data type
rahul-rocket Mar 6, 2024
31292aa
Merge pull request #7654 from ever-co/fix/working-employee
rahul-rocket Mar 6, 2024
146820e
fix: disabled eager loading for counts API
rahul-rocket Mar 6, 2024
6cfe348
Merge pull request #7656 from ever-co/fix/counts-disabled-eager-loading
rahul-rocket Mar 6, 2024
a599a6d
feat: adding more OTEL providers
evereq Mar 6, 2024
53007c1
fix: some more improvement to OTEL
evereq Mar 6, 2024
84220a5
feat: add Zipkin OTEL
evereq Mar 6, 2024
f1ad74a
Chore: deployments to DO Droplets and App Platform improvements (#7647)
evereq Mar 6, 2024
23230f0
Merge pull request #7658 from ever-co/develop
evereq Mar 6, 2024
c17c8df
fix: compare hash inside query builder
rahul-rocket Mar 7, 2024
61ca802
fix: optimize user login code update query
rahul-rocket Mar 7, 2024
b7bc03a
Merge pull request #7659 from ever-co/fix/signin-email-password
rahul-rocket Mar 7, 2024
a6b5abc
Merge pull request #7660 from ever-co/develop
evereq Mar 7, 2024
2b57fec
fix: only enable Sentry Middlewares if Sentry is enabled
evereq Mar 7, 2024
ea47481
chore: update TypeORM / NestJs to latest
evereq Mar 7, 2024
68a1838
chore: more packages updates for Nest / TypeORM
evereq Mar 7, 2024
d5e04d1
chore(deps): bump packages
rahul-rocket Mar 7, 2024
230303b
Merge pull request #7663 from ever-co/chore/packages-updates-typeorm-…
evereq Mar 7, 2024
37cc702
Merge pull request #7665 from ever-co/develop
evereq Mar 7, 2024
2ecb746
chore: update Mikro-ORM packages and more OTEL related fixes
evereq Mar 7, 2024
61e4486
fix: extracts user teams for email and password authentication
rahul-rocket Mar 8, 2024
3bc7ad0
Merge pull request #7667 from ever-co/fix/email-password-authentication
rahul-rocket Mar 8, 2024
142a141
Merge pull request #7668 from ever-co/develop
evereq Mar 8, 2024
1289c36
[Feat] Mikro Orm Query Support (#7507)
ckhandla94 Mar 8, 2024
2259cb5
Update README.md
evereq Mar 8, 2024
5b21066
Merge pull request #7669 from ever-co/develop
evereq Mar 8, 2024
a49310b
chore: updated lock file
evereq Mar 8, 2024
fd69a29
Merge pull request #7670 from ever-co/develop
evereq Mar 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ aliases:
echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
nvm install v18
nvm alias default v18
echo 'export NODE_OPTIONS=--max-old-space-size=7000' >> $BASH_ENV
echo 'export NODE_OPTIONS=--max-old-space-size=12288' >> $BASH_ENV
echo 'export NG_CLI_ANALYTICS=false' >> $BASH_ENV
source $BASH_ENV
nvm use v18
Expand Down
6 changes: 4 additions & 2 deletions .deploy/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ ARG APP_MAGIC_SIGN_URL
ARG COMPANY_LINK
ARG COMPANY_NAME
ARG OTEL_ENABLED
ARG OTEL_PROVIDER
ARG OTEL_EXPORTER_OTLP_HEADERS
ARG OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
ARG REDIS_ENABLED
Expand Down Expand Up @@ -288,7 +289,7 @@ USER node:node

ENV CI=true

ENV NODE_OPTIONS=${NODE_OPTIONS:-"--max-old-space-size=7000"}
ENV NODE_OPTIONS=${NODE_OPTIONS:-"--max-old-space-size=12288"}
ENV NODE_ENV=${NODE_ENV:-production}
ENV API_HOST=${API_HOST:-api}
ENV API_PORT=${API_PORT:-3000}
Expand All @@ -304,7 +305,7 @@ ENV DB_NAME=${DB_NAME:-postgres}
ENV DB_PORT=${DB_PORT:-5432}
ENV DB_USER=${DB_USER}
ENV DB_PASS=${DB_PASS}
ENV DB_TYPE=${DB_TYPE:-sqlite}
ENV DB_TYPE=${DB_TYPE:-better-sqlite3}
ENV DB_SSL_MODE=${DB_SSL_MODE}
ENV DB_CA_CERT=${DB_CA_CERT}
ENV DB_POOL_SIZE=${DB_POOL_SIZE}
Expand Down Expand Up @@ -380,6 +381,7 @@ ENV APP_MAGIC_SIGN_URL=${APP_MAGIC_SIGN_URL}
ENV COMPANY_LINK=${COMPANY_LINK}
ENV COMPANY_NAME=${COMPANY_NAME}
ENV OTEL_ENABLED=${OTEL_ENABLED}
ENV OTEL_PROVIDER=${OTEL_PROVIDER}
ENV OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT}
ENV OTEL_EXPORTER_OTLP_HEADERS=${OTEL_EXPORTER_OTLP_HEADERS}
ENV REDIS_ENABLED=${REDIS_ENABLED}
Expand Down
2 changes: 2 additions & 0 deletions .deploy/k8s/k8s-manifest.civo.demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ spec:
value: '$CLOUD_PROVIDER'
- name: OTEL_ENABLED
value: '$OTEL_ENABLED'
- name: OTEL_PROVIDER
value: '$OTEL_PROVIDER'
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
value: '$OTEL_EXPORTER_OTLP_TRACES_ENDPOINT'
- name: OTEL_EXPORTER_OTLP_HEADERS
Expand Down
2 changes: 2 additions & 0 deletions .deploy/k8s/k8s-manifest.civo.prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ spec:
value: '$JITSU_SERVER_WRITE_KEY'
- name: OTEL_ENABLED
value: '$OTEL_ENABLED'
- name: OTEL_PROVIDER
value: '$OTEL_PROVIDER'
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
value: '$OTEL_EXPORTER_OTLP_TRACES_ENDPOINT'
- name: OTEL_EXPORTER_OTLP_HEADERS
Expand Down
2 changes: 2 additions & 0 deletions .deploy/k8s/k8s-manifest.civo.stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ spec:
value: '$JITSU_SERVER_WRITE_KEY'
- name: OTEL_ENABLED
value: '$OTEL_ENABLED'
- name: OTEL_PROVIDER
value: '$OTEL_PROVIDER'
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
value: '$OTEL_EXPORTER_OTLP_TRACES_ENDPOINT'
- name: OTEL_EXPORTER_OTLP_HEADERS
Expand Down
2 changes: 2 additions & 0 deletions .deploy/k8s/k8s-manifest.cw.demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ spec:
value: '86400'
- name: OTEL_ENABLED
value: '$OTEL_ENABLED'
- name: OTEL_PROVIDER
value: '$OTEL_PROVIDER'
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
value: '$OTEL_EXPORTER_OTLP_TRACES_ENDPOINT'
- name: OTEL_EXPORTER_OTLP_HEADERS
Expand Down
2 changes: 2 additions & 0 deletions .deploy/k8s/k8s-manifest.cw.prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ spec:
value: '$JITSU_SERVER_WRITE_KEY'
- name: OTEL_ENABLED
value: '$OTEL_ENABLED'
- name: OTEL_PROVIDER
value: '$OTEL_PROVIDER'
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
value: '$OTEL_EXPORTER_OTLP_TRACES_ENDPOINT'
- name: OTEL_EXPORTER_OTLP_HEADERS
Expand Down
2 changes: 2 additions & 0 deletions .deploy/k8s/k8s-manifest.cw.stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ spec:
value: '$JITSU_SERVER_WRITE_KEY'
- name: OTEL_ENABLED
value: '$OTEL_ENABLED'
- name: OTEL_PROVIDER
value: '$OTEL_PROVIDER'
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
value: '$OTEL_EXPORTER_OTLP_TRACES_ENDPOINT'
- name: OTEL_EXPORTER_OTLP_HEADERS
Expand Down
2 changes: 2 additions & 0 deletions .deploy/k8s/k8s-manifest.demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ spec:
value: '86400'
- name: OTEL_ENABLED
value: '$OTEL_ENABLED'
- name: OTEL_PROVIDER
value: '$OTEL_PROVIDER'
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
value: '$OTEL_EXPORTER_OTLP_TRACES_ENDPOINT'
- name: OTEL_EXPORTER_OTLP_HEADERS
Expand Down
2 changes: 2 additions & 0 deletions .deploy/k8s/k8s-manifest.prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@ spec:
value: '$JITSU_SERVER_WRITE_KEY'
- name: OTEL_ENABLED
value: '$OTEL_ENABLED'
- name: OTEL_PROVIDER
value: '$OTEL_PROVIDER'
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
value: '$OTEL_EXPORTER_OTLP_TRACES_ENDPOINT'
- name: OTEL_EXPORTER_OTLP_HEADERS
Expand Down
2 changes: 2 additions & 0 deletions .deploy/k8s/k8s-manifest.stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ spec:
value: '$JITSU_SERVER_WRITE_KEY'
- name: OTEL_ENABLED
value: '$OTEL_ENABLED'
- name: OTEL_PROVIDER
value: '$OTEL_PROVIDER'
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
value: '$OTEL_EXPORTER_OTLP_TRACES_ENDPOINT'
- name: OTEL_EXPORTER_OTLP_HEADERS
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
version: '3.8'

services:
nginx:
image: nginx:latest
volumes:
- ./nginx.demo.pre.cloudflare.conf:/etc/nginx/nginx.conf:ro
- ./ingress.api.crt:/etc/nginx/ssl/fullchain.pem
- ./ingress.api.key:/etc/nginx/ssl/privkey.pem
restart: unless-stopped
ports:
- "80:80"
- "443:443"
networks:
- with-cloudflare_overlay
volumes:
certificates: {}

networks:
with-cloudflare_overlay:
external: true

122 changes: 122 additions & 0 deletions .deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.template.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
version: '3.8'

services:
api:
image: ghcr.io/ever-co/gauzy-api-demo:latest
deploy:
mode: replicated
replicas: 2
environment:
API_HOST: '0.0.0.0'
DEMO: '${DEMO:-true}'
NODE_ENV: '${NODE_ENV:-development}'
ADMIN_PASSWORD_RESET: '${ADMIN_PASSWORD_RESET:-}'
API_BASE_URL: '${API_BASE_URL:-http://localhost:3000}'
CLIENT_BASE_URL: '${CLIENT_BASE_URL:-http://localhost:4200}'
DB_TYPE: '${DB_TYPE:-better-sqlite3}'
DB_URI: '${DB_URI:-}'
DB_HOST: '${DB_HOST:-}'
DB_USER: '${DB_USER:-}'
DB_PASS: '${DB_PASS:-}'
DB_NAME: '${DB_NAME:-}'
DB_PORT: '${DB_PORT:-}'
DB_CA_CERT: '${DB_CA_CERT:-}'
DB_SSL_MODE: '${DB_SSL_MODE:-}'
DB_POOL_SIZE: '${DB_POOL_SIZE:-}'
DB_POOL_SIZE_KNEX: '${DB_POOL_SIZE_KNEX:-}'
REDIS_ENABLED: '${REDIS_ENABLED:-}'
REDIS_URL: '${REDIS_URL:-}'
CLOUD_PROVIDER: 'DO'
SENTRY_DSN: '${SENTRY_DSN:-}'
SENTRY_TRACES_SAMPLE_RATE: '${SENTRY_TRACES_SAMPLE_RATE:-}'
SENTRY_PROFILE_SAMPLE_RATE: '${SENTRY_PROFILE_SAMPLE_RATE:-}'
SENTRY_HTTP_TRACING_ENABLED: '${SENTRY_HTTP_TRACING_ENABLED:-}'
SENTRY_POSTGRES_TRACKING_ENABLED: '${SENTRY_POSTGRES_TRACKING_ENABLED:-}'
SENTRY_PROFILING_ENABLED: '${SENTRY_PROFILING_ENABLED:-}'
AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID:-}'
AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY:-}'
AWS_REGION: '${AWS_REGION:-}'
AWS_S3_BUCKET: '${AWS_S3_BUCKET:-}'
WASABI_ACCESS_KEY_ID: '${WASABI_ACCESS_KEY_ID:-}'
WASABI_SECRET_ACCESS_KEY: '${WASABI_SECRET_ACCESS_KEY:-}'
WASABI_REGION: '${WASABI_REGION:-}'
WASABI_SERVICE_URL: '${WASABI_SERVICE_URL:-}'
WASABI_S3_BUCKET: '${WASABI_S3_BUCKET:-}'
EXPRESS_SESSION_SECRET: '${EXPRESS_SESSION_SECRET:-}'
JWT_SECRET: '${JWT_SECRET:-}'
JWT_REFRESH_TOKEN_SECRET: '${JWT_REFRESH_TOKEN_SECRET:-}'
JWT_REFRESH_TOKEN_EXPIRATION_TIME: '${JWT_REFRESH_TOKEN_EXPIRATION_TIME:-}'
CLOUDINARY_API_KEY: '${CLOUDINARY_API_KEY:-}'
CLOUDINARY_API_SECRET: '${CLOUDINARY_API_SECRET:-}'
CLOUDINARY_CLOUD_NAME: '${CLOUDINARY_CLOUD_NAME:-}'
MAIL_FROM_ADDRESS: '${MAIL_FROM_ADDRESS:-}'
MAIL_HOST: '${MAIL_HOST:-}'
MAIL_PORT: '${MAIL_PORT:-}'
MAIL_USERNAME: '${MAIL_USERNAME:-}'
MAIL_PASSWORD: '${MAIL_PASSWORD:-}'
ALLOW_SUPER_ADMIN_ROLE: '${ALLOW_SUPER_ADMIN_ROLE:-}'
GOOGLE_CLIENT_ID: '${GOOGLE_CLIENT_ID:-}'
GOOGLE_CLIENT_SECRET: '${GOOGLE_CLIENT_SECRET:-}'
GOOGLE_CALLBACK_URL: '${GOOGLE_CALLBACK_URL:-}'
FACEBOOK_CLIENT_ID: '${FACEBOOK_CLIENT_ID:-}'
FACEBOOK_CLIENT_SECRET: '${FACEBOOK_CLIENT_SECRET:-}'
FACEBOOK_GRAPH_VERSION: '${FACEBOOK_GRAPH_VERSION:-}'
FACEBOOK_CALLBACK_URL: '${FACEBOOK_CALLBACK_URL:-}'
INTEGRATED_USER_DEFAULT_PASS: '${INTEGRATED_USER_DEFAULT_PASS:-}'
UPWORK_REDIRECT_URL: '${UPWORK_REDIRECT_URL:-}'
FILE_PROVIDER: '${FILE_PROVIDER:-}'
GAUZY_AI_GRAPHQL_ENDPOINT: '${GAUZY_AI_GRAPHQL_ENDPOINT:-}'
GAUZY_AI_REST_ENDPOINT: '${GAUZY_AI_REST_ENDPOINT:-}'
UNLEASH_APP_NAME: '${UNLEASH_APP_NAME:-}'
UNLEASH_API_URL: '${UNLEASH_API_URL:-}'
UNLEASH_INSTANCE_ID: '${UNLEASH_INSTANCE_ID:-}'
UNLEASH_REFRESH_INTERVAL: '${UNLEASH_REFRESH_INTERVAL:-}'
UNLEASH_METRICS_INTERVAL: '${UNLEASH_METRICS_INTERVAL:-}'
UNLEASH_API_KEY: '${UNLEASH_API_KEY:-}'
PM2_MACHINE_NAME: '${PM2_MACHINE_NAME:-}'
PM2_SECRET_KEY: '${PM2_SECRET_KEY:-}'
PM2_PUBLIC_KEY: '${PM2_PUBLIC_KEY:-}'
JITSU_SERVER_URL: '${JITSU_SERVER_URL:-}'
JITSU_SERVER_WRITE_KEY: '${JITSU_SERVER_WRITE_KEY:-}'
OTEL_ENABLED: '${OTEL_ENABLED:-}'
OTEL_PROVIDER: '${OTEL_PROVIDER:-}'
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: '${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:-}'
OTEL_EXPORTER_OTLP_HEADERS: '${OTEL_EXPORTER_OTLP_HEADERS:-}'
GAUZY_GITHUB_CLIENT_ID: '${GAUZY_GITHUB_CLIENT_ID:-}'
GAUZY_GITHUB_CLIENT_SECRET: '${GAUZY_GITHUB_CLIENT_SECRET:-}'
GAUZY_GITHUB_APP_PRIVATE_KEY: '${GAUZY_GITHUB_APP_PRIVATE_KEY:-}'
GAUZY_GITHUB_WEBHOOK_URL: '${GAUZY_GITHUB_WEBHOOK_URL:-}'
GAUZY_GITHUB_WEBHOOK_SECRET: '${GAUZY_GITHUB_WEBHOOK_SECRET:-}'
GAUZY_GITHUB_APP_NAME: '${GAUZY_GITHUB_APP_NAME:-}'
GAUZY_GITHUB_REDIRECT_URL: '${GAUZY_GITHUB_REDIRECT_URL:-}'
GAUZY_GITHUB_POST_INSTALL_URL: '${GAUZY_GITHUB_POST_INSTALL_URL:-}'
GAUZY_GITHUB_APP_ID: '${GAUZY_GITHUB_APP_ID:-}'
GAUZY_GITHUB_OAUTH_CLIENT_ID: '${GAUZY_GITHUB_OAUTH_CLIENT_ID:-}'
GAUZY_GITHUB_OAUTH_CLIENT_SECRET: '${GAUZY_GITHUB_OAUTH_CLIENT_SECRET:-}'
GAUZY_GITHUB_OAUTH_CALLBACK_URL: '${GAUZY_GITHUB_OAUTH_CALLBACK_URL:-}'
JITSU_BROWSER_URL: '${JITSU_BROWSER_URL:-}'
JITSU_BROWSER_WRITE_KEY: '${JITSU_BROWSER_WRITE_KEY:-}'
MAGIC_CODE_EXPIRATION_TIME: '${MAGIC_CODE_EXPIRATION_TIME:-}'
APP_NAME: '${APP_NAME:-}'
APP_LOGO: '${APP_LOGO:-}'
APP_SIGNATURE: '${APP_SIGNATURE:-}'
APP_LINK: '${APP_LINK:-}'
APP_EMAIL_CONFIRMATION_URL: '${APP_EMAIL_CONFIRMATION_URL:-}'
APP_MAGIC_SIGN_URL: '${APP_MAGIC_SIGN_URL:-}'
COMPANY_LINK: '${COMPANY_LINK:-}'
COMPANY_NAME: '${COMPANY_NAME:-}'

entrypoint: './entrypoint.prod.sh'
command: ['node', 'main.js']
restart: on-failure
ports:
- '3000'
networks:
- overlay

volumes:
certificates: {}

networks:
overlay:
driver: bridge
25 changes: 25 additions & 0 deletions .deploy/ssh/with-cloudflare/demo/nginx.demo.pre.cloudflare.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
user nginx;
events {
worker_connections 1024;
}
http {
server {
listen 80;
server_name apidemodt.gauzy.co;

location / {
return 301 https://$host$request_uri;
}
}
server {
listen 443 ssl;
server_name apidemodt.gauzy.co;

ssl_certificate /etc/nginx/ssl/fullchain.pem;
ssl_certificate_key /etc/nginx/ssl/privkey.pem;

location / {
proxy_pass http://api:3000;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
version: '3.8'

services:
nginx:
image: nginx:latest
volumes:
- ./nginx.prod.pre.cloudflare.conf:/etc/nginx/nginx.conf:ro
- ./ingress.api.crt:/etc/nginx/ssl/fullchain.pem
- ./ingress.api.key:/etc/nginx/ssl/privkey.pem
restart: unless-stopped
ports:
- "80:80"
- "443:443"
networks:
- with-cloudflare_overlay
volumes:
certificates: {}

networks:
with-cloudflare_overlay:
external: true

Loading
Loading