Skip to content

Commit 2b2a2c2

Browse files
committed
[DOP-25348] Move server HEALTHCHECK to docker image
1 parent 4b744e2 commit 2b2a2c2

File tree

4 files changed

+2
-12
lines changed

4 files changed

+2
-12
lines changed

docker-compose.test.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@ services:
7373
condition: service_completed_successfully
7474
rabbitmq:
7575
condition: service_healthy
76-
healthcheck:
77-
test: [CMD-SHELL, curl -f http://localhost:8000/monitoring/ping]
78-
interval: 30s
79-
timeout: 5s
80-
retries: 3
81-
start_period: 5s
8276
profiles: [server, all]
8377

8478
scheduler:

docker-compose.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,6 @@ services:
7070
condition: service_completed_successfully
7171
rabbitmq:
7272
condition: service_healthy
73-
healthcheck:
74-
test: [CMD-SHELL, curl -f http://localhost:8000/monitoring/ping]
75-
interval: 30s
76-
timeout: 5s
77-
retries: 3
78-
start_period: 5s
7973
profiles:
8074
- server
8175
- frontend

docker/Dockerfile.server

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ COPY ./docker/entrypoint_server.sh /app/entrypoint.sh
3232
RUN chmod +x /app/entrypoint.sh \
3333
&& chmod +r -R /app/syncmaster/server/static
3434
ENTRYPOINT ["/app/entrypoint.sh"]
35+
HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 CMD ["curl", "-f", "http://localhost:8000/monitoring/ping"]
3536

3637

3738
FROM base AS builder

docs/changelog/0.2.1.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Improvements
55
------------
66

77
- Change docker image user from ``root`` to ``syncmaster``, to improve security.
8+
- Move server healthcheck to Docker image.
89

910
Bug fixes
1011
--------

0 commit comments

Comments
 (0)