ci(docker): remove yaml anchors in favor of environment array in docker-compose
fix #825, fix #824, fix #820
This commit is contained in:
parent
622f5fc28c
commit
29d94dfc14
11
.env.example
11
.env.example
|
@ -1,10 +1,10 @@
|
||||||
# Shared
|
# Server + Client
|
||||||
TZ=UTC
|
TZ=UTC
|
||||||
PUBLIC_URL=http://localhost
|
PUBLIC_URL=http://localhost:3000
|
||||||
PUBLIC_SERVER_URL=http://localhost/api
|
PUBLIC_SERVER_URL=http://localhost:3000/api
|
||||||
PUBLIC_GOOGLE_CLIENT_ID=
|
PUBLIC_GOOGLE_CLIENT_ID=
|
||||||
|
|
||||||
# Database
|
# Server + Database
|
||||||
POSTGRES_DB=postgres
|
POSTGRES_DB=postgres
|
||||||
POSTGRES_USER=postgres
|
POSTGRES_USER=postgres
|
||||||
POSTGRES_PASSWORD=postgres
|
POSTGRES_PASSWORD=postgres
|
||||||
|
@ -16,7 +16,6 @@ POSTGRES_PORT=5432
|
||||||
POSTGRES_SSL_CERT=
|
POSTGRES_SSL_CERT=
|
||||||
JWT_SECRET=
|
JWT_SECRET=
|
||||||
JWT_EXPIRY_TIME=604800
|
JWT_EXPIRY_TIME=604800
|
||||||
PUBLIC_GOOGLE_CLIENT_ID=
|
|
||||||
GOOGLE_CLIENT_SECRET=
|
GOOGLE_CLIENT_SECRET=
|
||||||
GOOGLE_API_KEY=
|
GOOGLE_API_KEY=
|
||||||
SENDGRID_API_KEY=
|
SENDGRID_API_KEY=
|
||||||
|
@ -30,5 +29,5 @@ STORAGE_URL_PREFIX=
|
||||||
STORAGE_ACCESS_KEY=
|
STORAGE_ACCESS_KEY=
|
||||||
STORAGE_SECRET_KEY=
|
STORAGE_SECRET_KEY=
|
||||||
|
|
||||||
# Flags
|
# Flags (Client)
|
||||||
PUBLIC_FLAG_DISABLE_SIGNUPS=false
|
PUBLIC_FLAG_DISABLE_SIGNUPS=false
|
|
@ -1,49 +1,13 @@
|
||||||
version: '3'
|
version: '3'
|
||||||
|
|
||||||
x-env-shared: &env-shared
|
|
||||||
environment:
|
|
||||||
- TZ=UTC
|
|
||||||
- PUBLIC_URL=http://localhost
|
|
||||||
- PUBLIC_SERVER_URL=http://localhost/api
|
|
||||||
- PUBLIC_GOOGLE_CLIENT_ID=
|
|
||||||
|
|
||||||
x-env-database: &env-database
|
|
||||||
environment:
|
|
||||||
- POSTGRES_DB=postgres
|
|
||||||
- POSTGRES_USER=postgres
|
|
||||||
- POSTGRES_PASSWORD=postgres
|
|
||||||
|
|
||||||
x-env-server: &env-server
|
|
||||||
environment:
|
|
||||||
- SECRET_KEY=
|
|
||||||
- POSTGRES_HOST=postgres
|
|
||||||
- POSTGRES_PORT=5432
|
|
||||||
- POSTGRES_SSL_CERT=
|
|
||||||
- JWT_SECRET=
|
|
||||||
- JWT_EXPIRY_TIME=604800
|
|
||||||
- PUBLIC_GOOGLE_CLIENT_ID=
|
|
||||||
- GOOGLE_CLIENT_SECRET=
|
|
||||||
- GOOGLE_API_KEY=
|
|
||||||
- SENDGRID_API_KEY=
|
|
||||||
- SENDGRID_FORGOT_PASSWORD_TEMPLATE_ID=
|
|
||||||
- SENDGRID_FROM_NAME=
|
|
||||||
- SENDGRID_FROM_EMAIL=
|
|
||||||
- STORAGE_BUCKET=
|
|
||||||
- STORAGE_REGION=
|
|
||||||
- STORAGE_ENDPOINT=
|
|
||||||
- STORAGE_URL_PREFIX=
|
|
||||||
- STORAGE_ACCESS_KEY=
|
|
||||||
- STORAGE_SECRET_KEY=
|
|
||||||
|
|
||||||
x-env-flags: &env-flags
|
|
||||||
environment:
|
|
||||||
- PUBLIC_FLAG_DISABLE_SIGNUPS=false
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:14.2-alpine
|
image: postgres:14.2-alpine
|
||||||
container_name: postgres
|
container_name: postgres
|
||||||
<<: *env-database
|
environment:
|
||||||
|
- POSTGRES_DB=postgres
|
||||||
|
- POSTGRES_USER=postgres
|
||||||
|
- POSTGRES_PASSWORD=postgres
|
||||||
ports:
|
ports:
|
||||||
- 5432:5432
|
- 5432:5432
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -71,9 +35,32 @@ services:
|
||||||
server:
|
server:
|
||||||
image: amruthpillai/reactive-resume:server-latest
|
image: amruthpillai/reactive-resume:server-latest
|
||||||
container_name: server
|
container_name: server
|
||||||
<<: *env-shared
|
environment:
|
||||||
<<: *env-server
|
- TZ=UTC
|
||||||
<<: *env-database
|
- PUBLIC_URL=http://localhost:3000
|
||||||
|
- PUBLIC_SERVER_URL=http://localhost:3000/api
|
||||||
|
- PUBLIC_GOOGLE_CLIENT_ID=
|
||||||
|
- POSTGRES_DB=postgres
|
||||||
|
- POSTGRES_USER=postgres
|
||||||
|
- POSTGRES_PASSWORD=postgres
|
||||||
|
- SECRET_KEY=
|
||||||
|
- POSTGRES_HOST=postgres
|
||||||
|
- POSTGRES_PORT=5432
|
||||||
|
- POSTGRES_SSL_CERT=
|
||||||
|
- JWT_SECRET=
|
||||||
|
- JWT_EXPIRY_TIME=604800
|
||||||
|
- GOOGLE_CLIENT_SECRET=
|
||||||
|
- GOOGLE_API_KEY=
|
||||||
|
- SENDGRID_API_KEY=
|
||||||
|
- SENDGRID_FORGOT_PASSWORD_TEMPLATE_ID=
|
||||||
|
- SENDGRID_FROM_NAME=
|
||||||
|
- SENDGRID_FROM_EMAIL=
|
||||||
|
- STORAGE_BUCKET=
|
||||||
|
- STORAGE_REGION=
|
||||||
|
- STORAGE_ENDPOINT=
|
||||||
|
- STORAGE_URL_PREFIX=
|
||||||
|
- STORAGE_ACCESS_KEY=
|
||||||
|
- STORAGE_SECRET_KEY=
|
||||||
depends_on:
|
depends_on:
|
||||||
- traefik
|
- traefik
|
||||||
- postgres
|
- postgres
|
||||||
|
@ -89,8 +76,12 @@ services:
|
||||||
client:
|
client:
|
||||||
image: amruthpillai/reactive-resume:client-latest
|
image: amruthpillai/reactive-resume:client-latest
|
||||||
container_name: client
|
container_name: client
|
||||||
<<: *env-shared
|
environment:
|
||||||
<<: *env-flags
|
- TZ=UTC
|
||||||
|
- PUBLIC_URL=http://localhost:3000
|
||||||
|
- PUBLIC_SERVER_URL=http://localhost:3000/api
|
||||||
|
- PUBLIC_GOOGLE_CLIENT_ID=
|
||||||
|
- PUBLIC_FLAG_DISABLE_SIGNUPS=false
|
||||||
depends_on:
|
depends_on:
|
||||||
- traefik
|
- traefik
|
||||||
- server
|
- server
|
||||||
|
|
Loading…
Reference in New Issue