Skip to content

Group common settings #73

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.

Sign up for GitHub

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

Merged
parisk merged 2 commits into from
Sep 3, 2019
Merged

Group common settings #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf51c50
Group common settings
parisk Sep 3, 2019
5106954
Group dev settings as well
parisk Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
version: '3.7'

x-common-dev-settings:
&common-dev-settings
CERYX_DEBUG: ${CERYX_DEBUG:-true}

services:
ceryx:
build: ./ceryx
Expand All @@ -8,16 +12,16 @@ services:
- ./ceryx/nginx/lualib:/usr/local/openresty/nginx/lualib
- ./ceryx/static:/etc/ceryx/static
environment:
CERYX_DEBUG: ${CERYX_DEBUG:-true}
<<: *common-dev-settings
CERYX_DOCKERIZE_EXTRA_ARGS: ""

api:
build: ./api
volumes:
- ./api:/opt/ceryx
environment:
<<: *common-dev-settings
CERYX_API_HOSTNAME: ${CERYX_API_HOSTNAME:-api.ceryx.dev}
CERYX_DEBUG: ${CERYX_DEBUG:-true}
command: uvicorn --reload --host 0.0.0.0 --port 5555 api:api

networks:
Expand Down
17 changes: 10 additions & 7 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
version: '3.7'

x-common-settings:
&common-settings
CERYX_DEBUG: ${CERYX_DEBUG:-false}
CERYX_REDIS_HOST: ${CERYX_REDIS_HOST:-redis}
CERYX_REDIS_PORT: ${CERYX_REDIS_PORT:-6379}
CERYX_REDIS_TIMEOUT: ${CERYX_REDIS_TIMEOUT:-100}


services:
ceryx:
image: sourcelair/ceryx:latest
Expand All @@ -9,13 +17,11 @@ services:
depends_on:
- redis
environment:
<<: *common-settings
CERYX_DISABLE_LETS_ENCRYPT: ${CERYX_DISABLE_LETS_ENCRYPT:-false}
CERYX_SSL_DEFAULT_CERTIFICATE: ${CERYX_SSL_DEFAULT_CERTIFICATE:-/etc/ceryx/ssl/default.crt}
CERYX_SSL_DEFAULT_KEY: ${CERYX_SSL_DEFAULT_KEY:-/etc/ceryx/ssl/default.key}
CERYX_DOCKERIZE_EXTRA_ARGS: -no-overwrite
CERYX_REDIS_HOST: ${CERYX_REDIS_HOST:-redis}
CERYX_REDIS_PORT: ${CERYX_REDIS_PORT:-6379}
CERYX_REDIS_TIMEOUT: ${CERYX_REDIS_TIMEOUT:-100}
command:
- usr/local/openresty/bin/openresty
- -g
Expand All @@ -27,13 +33,10 @@ services:
- redis
- ceryx
environment:
<<: *common-settings
CERYX_API_HOST: ${CERYX_API_HOST:-0.0.0.0}
CERYX_API_HOSTNAME: ${CERYX_API_HOSTNAME:-localhost}
CERYX_API_PORT: ${CERYX_API_PORT:-5555}
CERYX_DEBUG: ${CERYX_DEBUG:-false}
CERYX_REDIS_HOST: ${CERYX_REDIS_HOST:-redis}
CERYX_REDIS_PORT: ${CERYX_REDIS_PORT:-6379}
CERYX_REDIS_TIMEOUT: ${CERYX_REDIS_TIMEOUT:-100}

redis:
image: redis:3.2.11-alpine
Expand Down