diff options
| author | Victor Näslund <victor@sunet.se> | 2022-11-16 23:43:43 +0100 |
|---|---|---|
| committer | Victor Näslund <victor@sunet.se> | 2022-11-16 23:43:43 +0100 |
| commit | ec715926bb827478f0433e716977af9b0ea835bc (patch) | |
| tree | 889291b51f8538700e90855f57bed225d2f68d4c | |
| parent | 45eb98199215ac26e04c02091485b02470e2e46e (diff) | |
fixed healthcheck path
| -rw-r--r-- | data/collector_container/Dockerfile | 4 | ||||
| -rw-r--r-- | data/healthcheck.py (renamed from src/soc_collector/healthcheck.py) | 0 | ||||
| -rwxr-xr-x | data/healthcheck.sh (renamed from src/soc_collector/healthcheck.sh) | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/data/collector_container/Dockerfile b/data/collector_container/Dockerfile index a35b2cb..eef532f 100644 --- a/data/collector_container/Dockerfile +++ b/data/collector_container/Dockerfile @@ -29,6 +29,8 @@ COPY ./data/collector-dev.soc.sunet.se.crt /app/collector-dev.soc.sunet.se.crt COPY ./data/collector-dev.soc.sunet.se.key /app/collector-dev.soc.sunet.se.key COPY ./data/collector_root_ca.crt /app/collector_root_ca.crt COPY ./data/api_keys.txt /app/api_keys.txt +COPY ./data/healthcheck.sh /app/healthcheck.sh +COPY ./data/healthcheck.py /app/healthcheck.py WORKDIR /app/ @@ -36,7 +38,7 @@ USER soc_collector # Add healthcheck HEALTHCHECK --interval=2m --timeout=15s --retries=1 --start-period=30s \ - CMD sh ./src/soc_collector/healthcheck.sh COLLECTOR || bash -c 'kill -s 15 1 && (sleep 7; kill -s 9 1)' + CMD sh ./healthcheck.sh COLLECTOR || bash -c 'kill -s 15 1 && (sleep 7; kill -s 9 1)' ENTRYPOINT ["uvicorn", "src.soc_collector.main:app", "--log-config", "./logging.json", "--host", "0.0.0.0", "--port", "8000", "--ssl-keyfile", "./collector-dev.soc.sunet.se.key", "--ssl-certfile", "./collector-dev.soc.sunet.se.crt", "--ssl-version", "2", "--workers", "1", "--header", "server:collector"] diff --git a/src/soc_collector/healthcheck.py b/data/healthcheck.py index 1ccd8f3..1ccd8f3 100644 --- a/src/soc_collector/healthcheck.py +++ b/data/healthcheck.py diff --git a/src/soc_collector/healthcheck.sh b/data/healthcheck.sh index 10d599c..2e76684 100755 --- a/src/soc_collector/healthcheck.sh +++ b/data/healthcheck.sh @@ -8,4 +8,4 @@ then fi # If collector -/usr/bin/python3 ./src/soc_collector/healthcheck.py "$1" || exit 1 +/usr/bin/python3 ./healthcheck.py "$1" || exit 1 |