Skip to content
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

Jump to bottom

73 receive exit signal #74

Merged
merged 2 commits into from
Jun 28, 2024
Merged

73 receive exit signal #74

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
c7ab991
Dockerfile-generateconfig-* refactoring ENTRYPOINT
fb929 Jun 27, 2024
ab3dcd9
docker-compose.yml added "stop_signal" and refactoring "command"
fb929 Jun 27, 2024
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
2 changes: 1 addition & 1 deletion Dockerfile-generateconfig-anyconf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ HEALTHCHECK \
--interval=10s \
--timeout=3s \
CMD echo 'HEALTHCHECK' | nc 127.0.0.1 8000 | grep -q HEALTHCHECK
ENTRYPOINT ./docker-generateconfig/anyconf.sh
ENTRYPOINT ["/code/docker-generateconfig/anyconf.sh"]
2 changes: 1 addition & 1 deletion Dockerfile-generateconfig-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ FROM python:3.11-alpine
WORKDIR /code
COPY docker-generateconfig/env-requirements.txt requirements.txt
RUN pip install -r requirements.txt
ENTRYPOINT ./docker-generateconfig/env.py
ENTRYPOINT ["/code/docker-generateconfig/env.py"]
2 changes: 1 addition & 1 deletion Dockerfile-generateconfig-processing
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ HEALTHCHECK \
--interval=5s \
--timeout=3s \
CMD echo 'HEALTHCHECK' | nc 127.0.0.1 8000 | grep -q HEALTHCHECK
ENTRYPOINT ./docker-generateconfig/processing.sh
ENTRYPOINT ["/code/docker-generateconfig/processing.sh"]
18 changes: 9 additions & 9 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ services:
build:
context: .
dockerfile: Dockerfile-generateconfig-anyconf
stop_signal: SIGKILL
volumes:
- ./:/code
- "${STORAGE_DIR}:/code/storage"
Expand All @@ -16,6 +17,7 @@ services:
build:
context: .
dockerfile: Dockerfile-generateconfig-processing
stop_signal: SIGKILL
volumes:
- ./:/code
- "${STORAGE_DIR}:/code/storage"
Expand All @@ -25,7 +27,7 @@ services:
generateconfig-processing:
condition: service_healthy
image: "mongo:${MONGO_VERSION}"
command: --replSet ${MONGO_REPLICA_SET} --port ${MONGO_1_PORT}
command: ["--replSet", "${MONGO_REPLICA_SET}", "--port", "${MONGO_1_PORT}"]
ports:
- "${MONGO_1_PORT}:${MONGO_1_PORT}"
volumes:
Expand All @@ -41,7 +43,7 @@ services:
condition: service_healthy
image: "redis/redis-stack-server:${REDIS_VERSION}"
restart: always
command: redis-server --port ${REDIS_PORT} --dir /data/ --appendonly yes --maxmemory 256mb --maxmemory-policy noeviction --protected-mode no --loadmodule /opt/redis-stack/lib/redisbloom.so
command: ["redis-server", "--port", "${REDIS_PORT}", "--dir", "/data/", "--appendonly", "yes", "--maxmemory", "256mb", "--maxmemory-policy", "noeviction", "--protected-mode", "no", "--loadmodule", "/opt/redis-stack/lib/redisbloom.so"]
ports:
- "${REDIS_PORT}:${REDIS_PORT}"
volumes:
Expand All @@ -55,7 +57,7 @@ services:
minio:
image: "minio/minio:${MINIO_VERSION}"
restart: always
command: server /data --console-address ":${MINIO_WEB_PORT}" --address ":${MINIO_PORT}"
command: ["server", "/data", "--console-address", ":${MINIO_WEB_PORT}", "--address", ":${MINIO_PORT}"]
environment:
MINIO_ROOT_USER: "${AWS_ACCESS_KEY_ID}"
MINIO_ROOT_PASSWORD: "${AWS_SECRET_ACCESS_KEY}"
Expand All @@ -81,10 +83,7 @@ services:
restart: "no"
depends_on:
- minio
entrypoint:
- sh
- -c
- mc mb minio/${MINIO_BUCKET}
command: [ "mc", "mb", "minio/${MINIO_BUCKET}"]

any-sync-coordinator_bootstrap:
image: "ghcr.io/anyproto/any-sync-coordinator:${ANY_SYNC_COORDINATOR_VERSION}"
Expand All @@ -96,7 +95,7 @@ services:
volumes:
- ./etc/any-sync-coordinator/:/etc/any-sync-coordinator/
restart: "no"
command: bash -c "/bin/any-sync-confapply -c /etc/any-sync-coordinator/config.yml -n /etc/any-sync-coordinator/network.yml -e"
command: ["/bin/any-sync-confapply", "-c", "/etc/any-sync-coordinator/config.yml", "-n", "/etc/any-sync-coordinator/network.yml", "-e"]

any-sync-coordinator:
image: "ghcr.io/anyproto/any-sync-coordinator:${ANY_SYNC_COORDINATOR_VERSION}"
Expand Down Expand Up @@ -234,7 +233,8 @@ services:
volumes:
- ./:/code
- "${STORAGE_DIR}:/code/storage"
command: "tail -f /dev/null"
command: ["tail", "-f", "/dev/null"]
stop_signal: SIGKILL
tty: true
healthcheck:
test: any-sync-netcheck -c /code/storage/docker-generateconfig/nodes.yml 2>&1| grep -P 'netcheck\s+success'
Expand Down
Loading