summaryrefslogtreecommitdiff
path: root/data/collector_container
diff options
context:
space:
mode:
Diffstat (limited to 'data/collector_container')
-rw-r--r--data/collector_container/Dockerfile15
1 files changed, 9 insertions, 6 deletions
diff --git a/data/collector_container/Dockerfile b/data/collector_container/Dockerfile
index 0641587..a35b2cb 100644
--- a/data/collector_container/Dockerfile
+++ b/data/collector_container/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-20221024-slim@sha256:76cdda8fe5eb597ef5e712e4c9a9f5f1fb119e69f353daaa7bd6d0f6e66e541d
+FROM debian:bullseye-20221114-slim@sha256:df172d92d287ec4d4a538e5db8026fcde5f91f5f90061423d69d6148ff05cc47
EXPOSE 8000
@@ -21,21 +21,24 @@ RUN apt-get update \
RUN find / -xdev -perm /6000 -type f -exec chmod a-s {} \; || true
# Add user
-RUN useradd collector -u 1500 -s /usr/sbin/nologin
+RUN useradd soc_collector -u 1500 -s /usr/sbin/nologin
COPY ./src /app/src
COPY ./data/logging.json /app/logging.json
+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
WORKDIR /app/
-USER collector
+USER soc_collector
# Add healthcheck
HEALTHCHECK --interval=2m --timeout=15s --retries=1 --start-period=30s \
- CMD sh ./src/collector/healthcheck.sh COLLECTOR || bash -c 'kill -s 15 1 && (sleep 7; kill -s 9 1)'
-
-ENTRYPOINT ["uvicorn", "src.collector.main:app", "--log-config", "./logging.json", "--host", "0.0.0.0", "--workers", "1", "--header", "server:collector"]
+ CMD sh ./src/soc_collector/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"]