12 files changed, 0 insertions, 260 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
diff --git a/docker/couchdb/10-single-node.ini b/docker/couchdb/10-single-node.ini
deleted file mode 100644
index c85b081..0000000
--- a/docker/couchdb/10-single-node.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[couchdb]
-single_node=true
-\ No newline at end of file
diff --git a/docker/couchdb/Dockerfile b/docker/couchdb/Dockerfile
deleted file mode 100644
index ce3d5b2..0000000
--- a/docker/couchdb/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM couchdb:latest
-
-COPY 10-single-node.ini /opt/couchdb/etc/local.d/10-single-node.ini
-
-EXPOSE 5984
diff --git a/docker/docker-compose-dev.yaml b/docker/docker-compose-dev.yaml
deleted file mode 100644
index ead32e0..0000000
--- a/docker/docker-compose-dev.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Compose file for local development
-version: '3.7'
-services:
-  nginx:
-    build: ./nginx
-    ports:
-      - 1443:443
-    depends_on:
-      - collector
-    volumes:
-      - certs:/etc/ssl/collector/
-
-  collector:
-    build:
-      context: ..
-      dockerfile: docker/collector/Dockerfile-dev
-    environment:
-      - COUCHDB_USER
-      - COUCHDB_PASSWORD
-      - COUCHDB_NAME
-      - COUCHDB_HOSTNAME
-      - JWT_PUBKEY_PATH
-    volumes:
-      - ${DOCKER_JWT_PUBKEY_PATH}:/opt/certs/:ro
-    depends_on:
-      - couchdb
-
-  couchdb:
-    build: ./couchdb/
-    ports:
-      - "5984:5984"
-    environment:
-      - COUCHDB_USER
-      - COUCHDB_PASSWORD
-    volumes:
-      - type: volume
-        source: couchdb-data
-        target: /opt/couchdb/data
-
-volumes:
-  couchdb-data:
-  certs:
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
deleted file mode 100644
index 119d3a9..0000000
--- a/docker/docker-compose.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-version: '3.7'
-services:
-  nginx:
-    build: ./nginx
-    ports:
-      - 1443:443
-    depends_on:
-      - collector
-    volumes:
-      - certs:/etc/ssl/collector/
-
-  collector:
-    build:
-      context: ..
-      dockerfile: docker/collector/Dockerfile
-    environment:
-      - COUCHDB_USER
-      - COUCHDB_PASSWORD
-      - COUCHDB_NAME
-      - COUCHDB_HOSTNAME
-      - JWT_PUBKEY_PATH
-    volumes:
-      - ${DOCKER_JWT_PUBKEY_PATH}:/opt/certs/:ro
-    depends_on:
-      - couchdb
-
-  couchdb:
-    build: ./couchdb/
-    ports:
-      - "5984:5984"
-    environment:
-      - COUCHDB_USER
-      - COUCHDB_PASSWORD
-    volumes:
-      - type: volume
-        source: couchdb-data
-        target: /opt/couchdb/data
-
-volumes:
-  couchdb-data:
-    external: false
-  certs:
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
deleted file mode 100644
index c44c3cf..0000000
--- a/docker/nginx/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM nginx
-
-COPY certs/* /etc/ssl/collector/
-COPY default.conf /etc/nginx/conf.d/default.conf
diff --git a/docker/nginx/certs/soc_collector-key.pem b/docker/nginx/certs/soc_collector-key.pem
deleted file mode 100644
index 91b47df..0000000
--- a/docker/nginx/certs/soc_collector-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCnvrRD65+Ht4yi
-hyA4gVZ/fAPycpkE3gV4j/hOPKQ2HQ4/Hgu4gLvYbXWVSbjoVT0VkioEtpYQMA4E
-ZRwznV28pe6cQS1BdG1TkJpT4jTBa0JYRWD0Sk6uADtWtduEYIN2Zn/XRwc358Y7
-ios32prAJzer6OaILhFf4zEdC8K7z/9pWxH2nTsgAzFccReN+62AkaVfWmSCHk5I
-PpsoU076t18jHFTsfvl1r+u2fTQgokC9qFJ7zk62m3NhJh6D4n3J/KzQi4ZvdU7Z
-f5XHScdfcq2RoaYN55wS6zN5aSvcdksJMsFj/gOS0Wy5sMWS9MUf25merlqkwyZn
-iQqd4DwlAgMBAAECggEBAItSOSawbK+sI4JZ+Mj1o4H+3shfpfgE70ZTTUit1TWc
-rFh/+/wh7+KyBxcXRByzryhbXcrMW5bWUs4TrHiyG0i0CJp/B7d1m9fsIkHJf0em
-blQiS4Sasv6R8rbyFIC+KHIOb9+9fqFQP7T0PO0HA8DU0chWiCJTINsjN4eIXRTf
-NAzjL5xOnW2bIJTz1ZOWxZtVgSjbecKSw3PEy04RVmjEe2jcY0AqaG+IOvjNHgwZ
-PR7JVAeU8ReyeEaNHOnJTCtwwTvlxtU3dhwcCDJPlZjjzZ0tbovzFs051o5yJEp7
-/q0he1Oj9TN4UzqfZoq8ApaFRHCBaXPps97bQiaKo4ECgYEA2OfUfDwlVYLbNphb
-g8NKjTImhSrBGFXREOOCIE9HirpABR4FCXon0qKDaq3IkMenfuF9Wb7qb4cOA+g6
-xwYNxZAtXAzQ+AqjFiZOzJlyaYhToqKE5Pxific+x1VSNSk8DDkbS1IrTQU+hN0q
-y++UDiRm5GQnx3wzJ1UgziD4P+MCgYEAxfqRlnu344ZQssBgU35UmdMupDOPpzwL
-l/auo2TgQEqS35nSwqibSZ5rqh2WR7mkLTQuCyt3GFDyWHqMqUFzi0eFDzzZGEZt
-omjCJfhNUjZEoxWp3iVg1WDVpD0IIGeGWunTi8rw7AVO2SyAZrPrtr6d9/K1taxP
-ZTiQHSzuQlcCgYAJUDsBcpuvxkSfXX9gcvw6f9LDmQhdgSHO9dXaiUzrGgAxuA5D
-T+lx0+SMqhWYkdoRSqFVPytVypjBdjE/5nSk7QHll+9JFzvVcaOkiVouSdo9e3j1
-VBjujcTWTkWPXsvjQnh3jXmqfvUmQ1DZHNpgmROJ7vr+R8jygWc9MpE2PQKBgQC6
-GcjjIRcBvI99CBNESPtzwa0VUxaVSH9JcOxG0ZtvM+qOX8VbkCyw7kccmUVb1Oi8
-SVGC1G/WHrlAbKpurATWBvvQEA2uoP2L7leaY6cjQboRZ1rPZGl7CtSo12odM9N7
-AFQIE1OXOYId6ZQldrl7hgFuQuuGhBv59Uqa8lJhbwKBgEjjbYo+lSH1KeyK6goG
-lA944pJq8foYHRI23DPyl3E2ARRQgI2j5maJ80PV/1ECS3EaIQOqDaoMaMSTW2P2
-ZEHD8GKd+hoLot2iMjDXEKX0A3GsFR6380qSamJ0sv0dz5sANMB1KSNjdLZ/ZooN
-aEaBRM8DuT+ttKylj4B+uNDn
------END PRIVATE KEY-----
diff --git a/docker/nginx/certs/soc_collector.pem b/docker/nginx/certs/soc_collector.pem
deleted file mode 100644
index 4c9afc8..0000000
--- a/docker/nginx/certs/soc_collector.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEWzCCAsOgAwIBAgIQFFGAJROQSltNZhThNIJnLzANBgkqhkiG9w0BAQsFADCB
-hzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMS4wLAYDVQQLDCVraG5A
-S3Jpc3RvZmVycy1NQlAgKEtyaXN0b2ZlciBIYWxsaW4pMTUwMwYDVQQDDCxta2Nl
-cnQga2huQEtyaXN0b2ZlcnMtTUJQIChLcmlzdG9mZXIgSGFsbGluKTAeFw0yMjAy
-MDQwODIyMjNaFw0yNDA1MDQwNzIyMjNaMGcxJzAlBgNVBAoTHm1rY2VydCBkZXZl
-bG9wbWVudCBjZXJ0aWZpY2F0ZTE8MDoGA1UECwwza2huQEtyaXN0b2ZlcnMtTWFj
-Qm9vay1Qcm8ubG9jYWwgKEtyaXN0b2ZlciBIYWxsaW4pMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAp760Q+ufh7eMoocgOIFWf3wD8nKZBN4FeI/4Tjyk
-Nh0OPx4LuIC72G11lUm46FU9FZIqBLaWEDAOBGUcM51dvKXunEEtQXRtU5CaU+I0
-wWtCWEVg9EpOrgA7VrXbhGCDdmZ/10cHN+fGO4qLN9qawCc3q+jmiC4RX+MxHQvC
-u8//aVsR9p07IAMxXHEXjfutgJGlX1pkgh5OSD6bKFNO+rdfIxxU7H75da/rtn00
-IKJAvahSe85OtptzYSYeg+J9yfys0IuGb3VO2X+Vx0nHX3KtkaGmDeecEuszeWkr
-3HZLCTLBY/4DktFsubDFkvTFH9uZnq5apMMmZ4kKneA8JQIDAQABo2IwYDAOBgNV
-HQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHwYDVR0jBBgwFoAUzcpu
-HwNfeGSOBcv5b4qtfePeuDMwGAYDVR0RBBEwD4INc29jX2NvbGxlY3RvcjANBgkq
-hkiG9w0BAQsFAAOCAYEAx4b3jIymleUw+Bt/zUnKllmSOA581MrWT9tdLu/uC7hj
-KM2YidbzqmI7vnSCIp9YZGNZIK+7/lWopFWsIsqsd4BOaVuodZ/WK3e22+7h/yzd
-imde2bv0mSNHxFeaU4x++MNpjKStziC/UwD2PqNqoACXOIcXMqFL/esluKW1APKZ
-xTSxBcHmesNeFQL8wkK3HTYm7TYuKx/gcVnySvxnaPqJCRgF6jVtua83RTQXpS1b
-i8NW1sfF5La1/Biy0rnCIbOvQwWwPcou2hRQPMIS68dTFu0fJkhrrI/BVQj9doJp
-8WMCM1805uymn7OMEkJU4n3g7iicNWBnFr8C0UXvSVEkh35AG4J2CxMyixm83NaY
-1w0hDGcan0XPVTElRhXjmPO1aWQFwfUmfQm94GfJD4biGdAAhSU+ejuiGxCIS79e
-G4Av3Ax5ixqqnGboW4QSK04brqfBASLcg10kv60QEDp/Rj+VCMPnwa21FU0V1hBT
-8jMbIUkUrNlHLwGLZLPW
------END CERTIFICATE-----
diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
deleted file mode 100644
index 35eb2a2..0000000
--- a/docker/nginx/default.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-server {
-  listen 443 ssl;
-  server_name _;
-
-  ssl_certificate /etc/ssl/collector/soc_collector.pem;
-  ssl_certificate_key /etc/ssl/collector/soc_collector-key.pem;
-
-  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