From 53956a0be1c96531cb3452358dfac47efdf31bec Mon Sep 17 00:00:00 2001
From: Andrew Simonson <asimonson1125@gmail.com>
Date: Tue, 8 Oct 2024 13:00:37 -0400
Subject: [PATCH] replace deb dockerfile

---
 Dockerfile       | 36 ++++++++----------------------------
 README.md        |  9 ---------
 flask.conf       | 24 ------------------------
 gunicorn.conf    |  3 ---
 supervisord.conf | 19 -------------------
 5 files changed, 8 insertions(+), 83 deletions(-)
 delete mode 100644 README.md
 delete mode 100644 flask.conf
 delete mode 100644 gunicorn.conf
 delete mode 100644 supervisord.conf

diff --git a/Dockerfile b/Dockerfile
index 7c34d39..7ffd6ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,14 @@
-FROM ubuntu:lunar
+FROM docker.io/python:3.8-buster
 LABEL maintainer="Andrew Simonson <asimonson1125@gmail.com>"
 
-ENV DEBIAN_FRONTEND noninteractive
+WORKDIR /app
+ADD ./src /app
 
-RUN apt-get update
-RUN apt-get install -y python3-pip nginx gunicorn supervisor 
+COPY . .
 
-# Setup flask application
-RUN mkdir -p /deploy/app
-COPY src /deploy/app
-RUN pip install -r /deploy/app/requirements.txt --break-system-packages
+WORKDIR /app/src
 
-# Setup nginx
-RUN rm /etc/nginx/sites-enabled/default
-COPY flask.conf /etc/nginx/sites-available/
-RUN ln -s /etc/nginx/sites-available/flask.conf /etc/nginx/sites-enabled/flask.conf && \
-    echo "daemon off;" >> /etc/nginx/nginx.conf
+RUN apt-get -yq update && \
+    pip install --no-cache-dir -r requirements.txt
 
-# Setup supervisord
-RUN mkdir -p /var/log/supervisor
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf
-
-# Permissions
-# RUN adduser --disabled-password --gecos '' supervisor && \
-RUN chmod -R 777 /var/* && \
-    chown -R root /var/*
-
-# Entrypoint
-USER root
-
-# Start processes
-CMD ["/usr/bin/supervisord"]
+CMD [ "gunicorn", "--bind", "0.0.0.0:8080", "app:app"]
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index a9612ff..0000000
--- a/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# I made a uhh website
-So people can see how excellent my coding standards are.
-
-* Style: 5/10
-* Originality: 3/10
-* Security: Yes*
-* Viruses: not included
-
-You gotta uhh `pip3 install -r requirements.txt` and `python3 app.py` that thing
diff --git a/flask.conf b/flask.conf
deleted file mode 100644
index 873f9d8..0000000
--- a/flask.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-server {
-    listen      8080;
-    server_name www.asimonson.com;
-    return    301 https://asimonson.com$request_uri;
-}
-server {
-    listen      8080;
-    server_name asimonson.com;
-
-    gzip        on;
-    gzip_types  text/plain text/javascript text/css;
-    gunzip      on;
-
-    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
-    add_header X-Content-Type-Options 'nosniff';
-    add_header X-Frame-Options 'SAMEORIGIN';
-
-    location / {
-        proxy_pass http://localhost:5000/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-
-}
\ No newline at end of file
diff --git a/gunicorn.conf b/gunicorn.conf
deleted file mode 100644
index 6412df9..0000000
--- a/gunicorn.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[program:gunicorn]
-command=/usr/bin/gunicorn app:app -b localhost:5000
-directory=/deploy/app
diff --git a/supervisord.conf b/supervisord.conf
deleted file mode 100644
index 1ff0908..0000000
--- a/supervisord.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-[supervisord]
-nodaemon=true
-redirect_stderr=true
-stdout_logfile=/dev/null
-username = dummy
-password = dummy
-
-[program:nginx]
-command=/usr/sbin/nginx
-redirect_stderr=true
-stdout_logfile=/dev/null
-
-[unix_http_server]
-username = dummy
-password = dummy
-
-[supervisorctl]
-username = dummy
-password = dummy
\ No newline at end of file