diff options
| author | Kristofer Hallin <kristofer@sunet.se> | 2021-11-17 10:44:30 +0100 |
|---|---|---|
| committer | Kristofer Hallin <kristofer@sunet.se> | 2021-11-17 10:44:30 +0100 |
| commit | ab83f39bfc6f4d1422ab3be1d9d6d3d0422a235f (patch) | |
| tree | fb2a225b1620cd944e5345c6db77ae2cfdcd9ae0 /docker/collector | |
| parent | fc31d040886ddd9495a0318a7272468fe81a215e (diff) | |
Nginx is now running in its own container.
Diffstat (limited to 'docker/collector')
| -rw-r--r-- | docker/collector/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/collector/nginx.conf | 12 | ||||
| -rwxr-xr-x | docker/collector/setup.sh | 1 | ||||
| -rw-r--r-- | docker/collector/supervisord.conf | 9 | ||||
| -rw-r--r-- | docker/collector/wsgi_demo_users.yaml | 15 |
5 files changed, 2 insertions, 38 deletions
diff --git a/docker/collector/Dockerfile b/docker/collector/Dockerfile index 6a9f5e9..756f1f2 100644 --- a/docker/collector/Dockerfile +++ b/docker/collector/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bullseye ENV DEBIAN_FRONTEND noninteractive RUN apt update -RUN apt install -y git nginx supervisor emacs-nox virtualenv procps +RUN apt install -y git supervisor emacs-nox virtualenv procps RUN apt clean WORKDIR /opt/ @@ -14,7 +14,6 @@ WORKDIR /opt/collector/ COPY setup.sh /opt/collector/ COPY supervisord.conf /etc/supervisor/ -COPY nginx.conf /etc/nginx/sites-available/default RUN /opt/collector/setup.sh diff --git a/docker/collector/nginx.conf b/docker/collector/nginx.conf deleted file mode 100644 index adcb4da..0000000 --- a/docker/collector/nginx.conf +++ /dev/null @@ -1,12 +0,0 @@ -server { - listen 80; - server_name _; - - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log warn; - - location / { - proxy_pass http://localhost:8000; - - } -}
\ No newline at end of file diff --git a/docker/collector/setup.sh b/docker/collector/setup.sh index 057c9d7..65bf175 100755 --- a/docker/collector/setup.sh +++ b/docker/collector/setup.sh @@ -5,7 +5,6 @@ if [ ! -d /opt/certs/ ]; then mkdir /opt/certs/ fi -pip3 install uwsgi cd /opt/collector/ virtualenv venv . venv/bin/activate diff --git a/docker/collector/supervisord.conf b/docker/collector/supervisord.conf index 1fef83a..7e260c6 100644 --- a/docker/collector/supervisord.conf +++ b/docker/collector/supervisord.conf @@ -3,14 +3,7 @@ nodaemon=true [program:uvicorn] directory = /opt/collector/src/ -command = /opt/collector/venv/bin/uvicorn --proxy-headers --port 8000 main:app -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - -[program:nginx] -command=/usr/sbin/nginx -g "daemon off;" +command = /opt/collector/venv/bin/uvicorn --proxy-headers --host 0.0.0.0 --port 8000 main:app stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr diff --git a/docker/collector/wsgi_demo_users.yaml b/docker/collector/wsgi_demo_users.yaml deleted file mode 100644 index 49c4795..0000000 --- a/docker/collector/wsgi_demo_users.yaml +++ /dev/null @@ -1,15 +0,0 @@ -user1: - pw: pw1 - authz: - sunet.se: r - -user2: - pw: pw2 - authz: - su.se: r - -user3: - pw: pw3 - authz: - sunet.se: rw - su.se: r |