Merge pull request UltimaHoarder#1504 from DIGITALCRIMINAL/revert-1491-master

Revert "Improving Docker to multi-stage building."

Author: UltimaHoarder

.dockerignore

@@ -1,24 +1,5 @@
+.git
 .logs
 .settings
 .sites
-__pycache__
-
-# Docker
-Dockerfile
-.dockerignore
-
-# Git
-.git
-.gitignore
-
-# License
-LICENSE
-
-# PyCharm
-.idea
-
-# Readme
-*.md
-
-# Virtual Environment
-/venv/
+__pycache__

Dockerfile

@@ -1,49 +1,10 @@
-# Sets python:latest as the builder.
-FROM python:latest as builder
+FROM python:3-slim
 
-# Updates and installs required Linux dependencies.
-RUN set -eux \
-    && apt-get -y update \
-    && apt-get -y upgrade \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+WORKDIR /usr/src/app
 
-# Installs required Python dependencies.
-COPY requirements.txt /onlyfans/
-WORKDIR /onlyfans
-RUN pip install -r requirements.txt
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
 
-# Sets python:slim as the release image.
-FROM python:slim as release
+COPY . .
 
-# Defines new group and user for security reasons.
-RUN groupadd -r onlyfans \
-    && useradd -r -g onlyfans onlyfans
-
-# Updates and installs required Linux dependencies.
-RUN set -eux \
-    && apt-get -y update \
-    && apt-get -y upgrade \
-    && apt-get install -y \
-        libpq-dev \
-        vim \
-    \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Copies Linux binaries, and Python packages from the main builder.
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/python3.9/site-packages/ /usr/local/lib/python3.9/site-packages/
-
-# Copies the source code from the host into the container.
-COPY --chown=onlyfans:onlyfans . /onlyfans
-WORKDIR /onlyfans
-
-# Ensures that Python output will be sent to the terminal.
-ENV PYTHONUNBUFFERED 1
-
-# Changes to the new user for security reasons.
-USER onlyfans
-
-# Specifies the main executable for when the container starts.
 CMD [ "python", "./start_ofd.py" ]