From ab83f39bfc6f4d1422ab3be1d9d6d3d0422a235f Mon Sep 17 00:00:00 2001
From: Kristofer Hallin <kristofer@sunet.se>
Date: Wed, 17 Nov 2021 10:44:30 +0100
Subject: Nginx is now running in its own container.

---
 docker/collector/Dockerfile           |  3 +--
 docker/collector/nginx.conf           | 12 ------------
 docker/collector/setup.sh             |  1 -
 docker/collector/supervisord.conf     |  9 +--------
 docker/collector/wsgi_demo_users.yaml | 15 ---------------
 docker/docker-compose.yaml            | 10 ++++++++--
 docker/nginx/Dockerfile               | 13 +++++++++++++
 docker/nginx/nginx.conf               | 11 +++++++++++
 docker/nginx/supervisord.conf         |  9 +++++++++
 9 files changed, 43 insertions(+), 40 deletions(-)
 delete mode 100644 docker/collector/nginx.conf
 delete mode 100644 docker/collector/wsgi_demo_users.yaml
 create mode 100644 docker/nginx/Dockerfile
 create mode 100644 docker/nginx/nginx.conf
 create mode 100644 docker/nginx/supervisord.conf

(limited to 'docker')

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
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index c7ebbfb..502bd78 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -1,5 +1,13 @@
 version: '2.3'
 services:
+  nginx:
+    build: ./nginx
+    ports:
+      - 80:80
+      - 443:443
+    depends_on:
+      - collector
+
   collector:
     build: ./collector/
     environment:
@@ -8,8 +16,6 @@ services:
       - COUCHDB_NAME
       - COUCHDB_HOSTNAME
       - JWT_PUBKEY_PATH
-    ports:
-      - 80:80
     volumes:
       - ${DOCKER_JWT_PUBKEY_PATH}:/opt/certs/:ro
     depends_on:
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
new file mode 100644
index 0000000..9389b77
--- /dev/null
+++ b/docker/nginx/Dockerfile
@@ -0,0 +1,13 @@
+FROM debian:bullseye
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update
+RUN apt install -y nginx supervisor emacs-nox procps
+RUN apt clean
+
+COPY supervisord.conf /etc/supervisor/
+COPY nginx.conf /etc/nginx/sites-available/default
+
+ENTRYPOINT supervisord -c /etc/supervisor/supervisord.conf
+
diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf
new file mode 100644
index 0000000..a734b0e
--- /dev/null
+++ b/docker/nginx/nginx.conf
@@ -0,0 +1,11 @@
+server {
+  listen 80;
+  server_name _;
+
+  access_log /var/log/nginx/access.log;
+  error_log  /var/log/nginx/error.log warn;
+
+  location / {
+    proxy_pass http://collector:8000;
+  }
+}
\ No newline at end of file
diff --git a/docker/nginx/supervisord.conf b/docker/nginx/supervisord.conf
new file mode 100644
index 0000000..32656b7
--- /dev/null
+++ b/docker/nginx/supervisord.conf
@@ -0,0 +1,9 @@
+[supervisord]
+nodaemon=true
+
+[program:nginx]
+command=/usr/sbin/nginx -g "daemon off;"
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
-- 
cgit v1.1