diff options
| author | Victor Näslund <victor@sunet.se> | 2022-11-13 04:12:47 +0100 |
|---|---|---|
| committer | Victor Näslund <victor@sunet.se> | 2022-11-13 04:12:47 +0100 |
| commit | f7a40b9e13d242968db83acaac13660224eb0143 (patch) | |
| tree | d8f0cdf5d93cc1aebc83343aea6615bc2ee9bc55 /docker/collector | |
| parent | 8baecf339e8061160bee519e87ffe837d1525c18 (diff) | |
new direction
Diffstat (limited to 'docker/collector')
| -rw-r--r-- | docker/collector/Dockerfile | 49 | ||||
| -rw-r--r-- | docker/collector/_dev_dockerfile_dev | 22 | ||||
| -rwxr-xr-x | docker/collector/setup.sh | 16 | ||||
| -rw-r--r-- | docker/collector/supervisord.conf | 10 |
4 files changed, 0 insertions, 97 deletions
diff --git a/docker/collector/Dockerfile b/docker/collector/Dockerfile deleted file mode 100644 index 099bc0a..0000000 --- a/docker/collector/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -FROM debian:bullseye-20221024-slim@sha256:76cdda8fe5eb597ef5e712e4c9a9f5f1fb119e69f353daaa7bd6d0f6e66e541d - -# FROM debian:bullseye -# ENV DEBIAN_FRONTEND noninteractive -# RUN apt-get update -# RUN apt-get install -y git supervisor emacs-nox virtualenv procps - -COPY ./requirements.txt /opt/collector/requirements.txt - -RUN apt-get update \ - && apt-get install -y python3 python3-pip \ - && pip3 install -r /opt/collector/requirements.txt \ - && apt-get remove -y \ - gcc \ - curl \ - wget \ - python3-pip \ - python3-dev \ - && apt-get autoremove -y \ - && apt-get clean - - -# Remove setuid and setgid -RUN find / -xdev -perm /6000 -type f -exec chmod a-s {} \; || true - -# Add user -RUN useradd collector -u 1500 -s /usr/sbin/nologin - -COPY ./src /opt/collector/src - -WORKDIR /opt/collector/ - -USER collector - -ENTRYPOINT ["uvicorn", "src.collector.main:app", "--host", "0.0.0.0", "--workers", "1", "--header", "server:collector"] -# ENTRYPOINT ["sleep", "300"] - -# RUN git clone https://git.sunet.se/soc_collector.git /opt/collector -# WORKDIR /opt/collector/ -# COPY setup.sh /opt/collector/ -# COPY supervisord.conf /etc/supervisor/ - -# RUN /opt/collector/setup.sh -# ENTRYPOINT supervisord -c /etc/supervisor/supervisord.conf - - - - - diff --git a/docker/collector/_dev_dockerfile_dev b/docker/collector/_dev_dockerfile_dev deleted file mode 100644 index 15a6ebe..0000000 --- a/docker/collector/_dev_dockerfile_dev +++ /dev/null @@ -1,22 +0,0 @@ -FROM debian:bullseye-20221024-slim@sha256:76cdda8fe5eb597ef5e712e4c9a9f5f1fb119e69f353daaa7bd6d0f6e66e541d - -# FROM debian:bullseye - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt update -RUN apt install -y git supervisor emacs-nox virtualenv procps -RUN apt clean - -WORKDIR /opt/ - -COPY . /opt/collector - -WORKDIR /opt/collector/ - -COPY docker/collector/setup.sh /opt/collector/ -COPY docker/collector/supervisord.conf /etc/supervisor/ - -RUN /opt/collector/setup.sh - -ENTRYPOINT supervisord -c /etc/supervisor/supervisord.conf diff --git a/docker/collector/setup.sh b/docker/collector/setup.sh deleted file mode 100755 index fce6b42..0000000 --- a/docker/collector/setup.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -if [ ! -d /opt/certs/ ]; then - echo "Creating certs/ directory." - mkdir /opt/certs/ -fi - -cd /opt/collector/ - -if [ -d /opt/collector/venv/ ]; then - rm -rf /opt/collector/venv/ -fi - -virtualenv venv -. venv/bin/activate -pip3 install -r requirements.txt diff --git a/docker/collector/supervisord.conf b/docker/collector/supervisord.conf deleted file mode 100644 index 2a2f5ca..0000000 --- a/docker/collector/supervisord.conf +++ /dev/null @@ -1,10 +0,0 @@ -[supervisord] -nodaemon=true - -[program:uvicorn] -directory = /opt/collector/src/ -command = /opt/collector/venv/bin/uvicorn --log-level debug --proxy-headers --host 0.0.0.0 --port 8000 main:app -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 |