Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

fix(docker): fixes #853 added restart policy #854

Merged
merged 5 commits into from
Apr 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions docker-compose.fluentd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ services:
chaosgenius-fluentd:
container_name: chaosgenius-fluentd
image: fluent/fluentd:latest
restart: unless-stopped
environment:
- FLUENTD_CONF=log.conf
- FLUENT_UID=0
Expand All @@ -26,6 +27,7 @@ services:
container_name: chaosgenius-server
image: chaosgenius/chaosgenius-server:latest
command: sh setup/run-backend-docker.sh
restart: unless-stopped
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
Expand Down Expand Up @@ -85,6 +87,7 @@ services:
command: >
sh -c "npx react-inject-env set -d ./ &&
nginx -g 'daemon off;'"
restart: unless-stopped
volumes:
- ./frontend/nginx:/etc/nginx/conf.d/
ports:
Expand All @@ -101,13 +104,12 @@ services:
chaosgenius-db:
container_name: chaosgenius-db
image: postgres:13
restart: always
restart: unless-stopped
healthcheck:
test: [ "CMD", "pg_isready", "-q", "-d", "chaosgenius_data", "-U", "postgres" ]
timeout: 45s
interval: 10s
retries: 10
restart: always
environment:
- POSTGRES_USER=${DB_USERNAME}
- POSTGRES_PASSWORD=${DB_PASSWORD}
Expand All @@ -121,6 +123,7 @@ services:
chaosgenius-redis:
container_name: chaosgenius-redis
image: "redis:6.2-alpine"
restart: unless-stopped
depends_on:
- chaosgenius-fluentd
logging: *default-logging
Expand All @@ -129,6 +132,7 @@ services:
container_name: chaosgenius-scheduler
image: chaosgenius/chaosgenius-server:latest
command: celery -A run.celery beat --loglevel=DEBUG
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=${AIRBYTE_ENABLED}
Expand Down Expand Up @@ -166,6 +170,7 @@ services:
container_name: chaosgenius-worker-analytics
image: chaosgenius/chaosgenius-server:latest
command: celery -A run.celery worker --loglevel=INFO --concurrency=2 -P processes -Q anomaly-rca
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=${AIRBYTE_ENABLED}
Expand Down Expand Up @@ -220,6 +225,7 @@ services:
container_name: chaosgenius-worker-alerts
image: chaosgenius/chaosgenius-server:latest
command: celery -A run.celery worker --loglevel=INFO --concurrency=2 -P processes -Q alerts
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=${AIRBYTE_ENABLED}
Expand Down
10 changes: 8 additions & 2 deletions docker-compose.latest-thirdparty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ services:
apk upgrade &&
apk add bash &&
bash /setup/docker/setup-airbyte-images.sh"
restart: unless-stopped
volumes:
- ./setup:/setup
- /var/run/docker.sock:/var/run/docker.sock
Expand All @@ -39,6 +40,7 @@ services:
container_name: chaosgenius-server
image: chaosgenius/chaosgenius-server:latest
command: sh setup/run-backend-docker.sh
restart: unless-stopped
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
Expand Down Expand Up @@ -97,6 +99,7 @@ services:
command: >
sh -c "npx react-inject-env set -d ./ &&
nginx -g 'daemon off;'"
restart: unless-stopped
volumes:
- ./frontend/nginx:/etc/nginx/conf.d/
ports:
Expand All @@ -111,13 +114,12 @@ services:
chaosgenius-db:
container_name: chaosgenius-db
image: postgres:13
restart: always
restart: unless-stopped
healthcheck:
test: [ "CMD", "pg_isready", "-q", "-d", "chaosgenius_data", "-U", "postgres" ]
timeout: 45s
interval: 10s
retries: 10
restart: always
environment:
- POSTGRES_USER=${DB_USERNAME}
- POSTGRES_PASSWORD=${DB_PASSWORD}
Expand All @@ -130,11 +132,13 @@ services:
chaosgenius-redis:
container_name: chaosgenius-redis
image: "redis:6.2-alpine"
restart: unless-stopped

chaosgenius-scheduler:
container_name: chaosgenius-scheduler
image: chaosgenius/chaosgenius-server:latest
command: celery -A run.celery beat --loglevel=DEBUG
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=True
Expand Down Expand Up @@ -170,6 +174,7 @@ services:
container_name: chaosgenius-worker-analytics
image: chaosgenius/chaosgenius-server:latest
command: celery -A run.celery worker --loglevel=INFO --concurrency=2 -P processes -Q anomaly-rca
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=True
Expand Down Expand Up @@ -222,6 +227,7 @@ services:
container_name: chaosgenius-worker-alerts
image: chaosgenius/chaosgenius-server:latest
command: celery -A run.celery worker --loglevel=INFO --concurrency=2 -P processes -Q alerts
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=True
Expand Down
9 changes: 7 additions & 2 deletions docker-compose.latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ services:
container_name: chaosgenius-server
image: chaosgenius/chaosgenius-server:latest
command: sh setup/run-backend-docker.sh
restart: unless-stopped
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
Expand Down Expand Up @@ -71,6 +72,7 @@ services:
command: >
sh -c "npx react-inject-env set -d ./ &&
nginx -g 'daemon off;'"
restart: unless-stopped
volumes:
- ./frontend/nginx:/etc/nginx/conf.d/
ports:
Expand All @@ -85,13 +87,12 @@ services:
chaosgenius-db:
container_name: chaosgenius-db
image: postgres:13
restart: always
restart: unless-stopped
healthcheck:
test: [ "CMD", "pg_isready", "-q", "-d", "chaosgenius_data", "-U", "postgres" ]
timeout: 45s
interval: 10s
retries: 10
restart: always
environment:
- POSTGRES_USER=${DB_USERNAME}
- POSTGRES_PASSWORD=${DB_PASSWORD}
Expand All @@ -102,11 +103,13 @@ services:
chaosgenius-redis:
container_name: chaosgenius-redis
image: "redis:6.2-alpine"
restart: unless-stopped

chaosgenius-scheduler:
container_name: chaosgenius-scheduler
image: chaosgenius/chaosgenius-server:latest
command: celery -A run.celery beat --loglevel=DEBUG
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=${AIRBYTE_ENABLED}
Expand Down Expand Up @@ -142,6 +145,7 @@ services:
container_name: chaosgenius-worker-analytics
image: chaosgenius/chaosgenius-server:latest
command: celery -A run.celery worker --loglevel=INFO --concurrency=2 -P processes -Q anomaly-rca
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=${AIRBYTE_ENABLED}
Expand Down Expand Up @@ -194,6 +198,7 @@ services:
container_name: chaosgenius-worker-alerts
image: chaosgenius/chaosgenius-server:latest
command: celery -A run.celery worker --loglevel=INFO --concurrency=2 -P processes -Q alerts
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=${AIRBYTE_ENABLED}
Expand Down
10 changes: 8 additions & 2 deletions docker-compose.thirdparty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ services:
apk upgrade &&
apk add bash &&
bash /setup/docker/setup-airbyte-images.sh"
restart: unless-stopped
volumes:
- ./setup:/setup
- /var/run/docker.sock:/var/run/docker.sock
Expand All @@ -39,6 +40,7 @@ services:
container_name: chaosgenius-server
image: chaosgenius/chaosgenius-server:0.5.1
command: sh setup/run-backend-docker.sh
restart: unless-stopped
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
Expand Down Expand Up @@ -97,6 +99,7 @@ services:
command: >
sh -c "npx react-inject-env set -d ./ &&
nginx -g 'daemon off;'"
restart: unless-stopped
volumes:
- ./frontend/nginx:/etc/nginx/conf.d/
ports:
Expand All @@ -111,13 +114,12 @@ services:
chaosgenius-db:
container_name: chaosgenius-db
image: postgres:13
restart: always
restart: unless-stopped
healthcheck:
test: [ "CMD", "pg_isready", "-q", "-d", "chaosgenius_data", "-U", "postgres" ]
timeout: 45s
interval: 10s
retries: 10
restart: always
environment:
- POSTGRES_USER=${DB_USERNAME}
- POSTGRES_PASSWORD=${DB_PASSWORD}
Expand All @@ -130,11 +132,13 @@ services:
chaosgenius-redis:
container_name: chaosgenius-redis
image: "redis:6.2-alpine"
restart: unless-stopped

chaosgenius-scheduler:
container_name: chaosgenius-scheduler
image: chaosgenius/chaosgenius-server:0.5.1
command: celery -A run.celery beat --loglevel=DEBUG
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=True
Expand Down Expand Up @@ -170,6 +174,7 @@ services:
container_name: chaosgenius-worker-analytics
image: chaosgenius/chaosgenius-server:0.5.1
command: celery -A run.celery worker --loglevel=INFO --concurrency=2 -P processes -Q anomaly-rca
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=True
Expand Down Expand Up @@ -222,6 +227,7 @@ services:
container_name: chaosgenius-worker-alerts
image: chaosgenius/chaosgenius-server:0.5.1
command: celery -A run.celery worker --loglevel=INFO --concurrency=2 -P processes -Q alerts
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=True
Expand Down
9 changes: 7 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ services:
container_name: chaosgenius-server
image: chaosgenius/chaosgenius-server:0.5.1
command: sh setup/run-backend-docker.sh
restart: unless-stopped
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
Expand Down Expand Up @@ -71,6 +72,7 @@ services:
command: >
sh -c "npx react-inject-env set -d ./ &&
nginx -g 'daemon off;'"
restart: unless-stopped
volumes:
- ./frontend/nginx:/etc/nginx/conf.d/
ports:
Expand All @@ -85,13 +87,12 @@ services:
chaosgenius-db:
container_name: chaosgenius-db
image: postgres:13
restart: always
restart: unless-stopped
healthcheck:
test: [ "CMD", "pg_isready", "-q", "-d", "chaosgenius_data", "-U", "postgres" ]
timeout: 45s
interval: 10s
retries: 10
restart: always
environment:
- POSTGRES_USER=${DB_USERNAME}
- POSTGRES_PASSWORD=${DB_PASSWORD}
Expand All @@ -102,11 +103,13 @@ services:
chaosgenius-redis:
container_name: chaosgenius-redis
image: "redis:6.2-alpine"
restart: unless-stopped

chaosgenius-scheduler:
container_name: chaosgenius-scheduler
image: chaosgenius/chaosgenius-server:0.5.1
command: celery -A run.celery beat --loglevel=DEBUG
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=${AIRBYTE_ENABLED}
Expand Down Expand Up @@ -142,6 +145,7 @@ services:
container_name: chaosgenius-worker-analytics
image: chaosgenius/chaosgenius-server:0.5.1
command: celery -A run.celery worker --loglevel=INFO --concurrency=2 -P processes -Q anomaly-rca
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=${AIRBYTE_ENABLED}
Expand Down Expand Up @@ -194,6 +198,7 @@ services:
container_name: chaosgenius-worker-alerts
image: chaosgenius/chaosgenius-server:0.5.1
command: celery -A run.celery worker --loglevel=INFO --concurrency=2 -P processes -Q alerts
restart: unless-stopped
environment:
- IN_DOCKER=True
- AIRBYTE_ENABLED=${AIRBYTE_ENABLED}
Expand Down