Skip to content

[chore] config reshuffle #12

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

Open
theorm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[chore] config reshuffle #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ config
*.tar.bz2
*.tar.gz
*.zip
config_preprod
config_prod
config_dev
.DS_Store
.env

config_*
data/**/*
15 changes: 9 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ services:
fluentd-async-connect: "true"
tag: impresso.redis
socks-proxy:
container_name: socks-proxy
image: kroniak/ssh-client
restart: always
profiles:
Expand Down Expand Up @@ -53,10 +54,12 @@ services:
- mysql-tunnel
- impresso-middle-layer
volumes:
- ./config/impresso-middle-layer-public.json:/impresso-middle-layer/config/docker.json
- ./config/impresso-middle-layer.json:/impresso-middle-layer/config/docker.json
- ./config/impresso-middle-layer-public.json:/impresso-middle-layer/config/api-docker.json
- middle-layer-cache:/impresso-middle-layer/data
environment:
NODE_ENV: docker
HOST: api
# Uncomment if you want to debug the API
# DEBUG: 'impresso*'
logging:
Expand Down Expand Up @@ -119,7 +122,7 @@ services:
environment:
DJANGO_SETTINGS_MODULE: impresso_recsys.docker_settings
expose:
- '8000'
- "8000"
volumes:
- ./config/recsys_config.py:/app/impresso_recsys/docker_settings.py
logging:
Expand All @@ -135,7 +138,7 @@ services:
profiles:
- barista
expose:
- '8000'
- "8000"
volumes:
- ./config/barista.env:/app/.env
logging:
Expand Down Expand Up @@ -183,7 +186,7 @@ services:
container_name: impresso-nginx
restart: always
ports:
- '${NGINX_PORT:-80}:80'
- "${NGINX_PORT:-80}:80"
depends_on:
- impresso-middle-layer
- impresso-user-admin
Expand All @@ -201,11 +204,11 @@ services:
# command: [nginx-debug, '-g', 'daemon off;']
# Run healthcheck script
healthcheck:
test: 'sh /tmp/healthcheck.sh'
test: "sh /tmp/healthcheck.sh"
timeout: 4s
retries: 1
labels:
- 'com.centurylinklabs.watchtower.depends-on=impresso-recsys,impresso-user-admin,impresso-middle-layer-public,impresso-middle-layer'
- "com.centurylinklabs.watchtower.depends-on=impresso-recsys,impresso-user-admin,impresso-middle-layer-public,impresso-middle-layer"
fluentd:
container_name: impresso-fluentd
restart: always
Expand Down