Browse Source

ci: remove comments, fix redis perms,

Signed-off-by: rare-magma <rare-magma@posteo.eu>
pull/3614/head
rare-magma 1 year ago
parent
commit
75a0cb301e
Failed to extract signature
  1. 1
      docker/docker-compose.build.yml
  2. 30
      docker/docker-compose.yml

1
docker/docker-compose.build.yml

@ -6,7 +6,6 @@ services:
- ../.env - ../.env
environment: environment:
DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
NODE_ENV: production
REDIS_HOST: redis REDIS_HOST: redis
REDIS_PASSWORD: ${REDIS_PASSWORD} REDIS_PASSWORD: ${REDIS_PASSWORD}
ports: ports:

30
docker/docker-compose.yml

@ -7,18 +7,10 @@ services:
- ALL - ALL
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
# uncomment to set resource usage limits
# deploy:
# resources:
# limits:
# cpus: "4"
# memory: 500m
# pids: 1024
env_file: env_file:
- ../.env - ../.env
environment: environment:
DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
NODE_ENV: production
REDIS_HOST: redis REDIS_HOST: redis
REDIS_PASSWORD: ${REDIS_PASSWORD} REDIS_PASSWORD: ${REDIS_PASSWORD}
ports: ports:
@ -33,6 +25,7 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
postgres: postgres:
image: docker.io/library/postgres:15 image: docker.io/library/postgres:15
cap_drop: cap_drop:
@ -45,13 +38,6 @@ services:
- SETUID - SETUID
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
# uncomment to set resource usage limits
# deploy:
# resources:
# limits:
# cpus: "2"
# memory: 250m
# pids: 1024
env_file: env_file:
- ../.env - ../.env
healthcheck: healthcheck:
@ -64,19 +50,11 @@ services:
redis: redis:
image: docker.io/library/redis:alpine image: docker.io/library/redis:alpine
# cap_drop: user: "999:1000"
# - ALL cap_drop:
# cap_add: - ALL
# - DAC_OVERRIDE
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
# uncomment to set resource usage limits
# deploy:
# resources:
# limits:
# cpus: "2"
# memory: 250m
# pids: 1024
env_file: env_file:
- ../.env - ../.env
command: ['redis-server', '--requirepass', $REDIS_PASSWORD] command: ['redis-server', '--requirepass', $REDIS_PASSWORD]

Loading…
Cancel
Save