Revert "OpenConceptLab/ocl_issues#897 Run OCL API using gunicorn"

This reverts commit dbeff0d.

Author: rkorytkowski

Dockerfile

@@ -1,37 +1,12 @@
-FROM python:3.9.6-alpine as builder
+FROM python:3.8.3
 ENV PYTHONUNBUFFERED 1
-ENV PYTHONDONTWRITEBYTECODE 1
 ARG SOURCE_COMMIT
-
-RUN apk update && apk upgrade && \
-    apk add --no-cache bash git gcc openssl-dev libffi-dev postgresql-dev python3-dev musl-dev cargo
-
-RUN pip install --upgrade pip
-
 RUN mkdir /code
-WORKDIR /code
 ADD requirements.txt /code/
-
-RUN pip wheel --no-cache-dir --wheel-dir /code/wheels -r requirements.txt
-
-FROM python:3.9.6-alpine
-
-RUN addgroup -S ocl && adduser -S ocl -G ocl
-
-ENV APP_HOME=/home/ocl/code
-
-RUN mkdir -p $APP_HOME
-WORKDIR $APP_HOME
-
-RUN apk update && apk add --no-cache libpq bash
-COPY --from=builder /code/wheels /wheels
-COPY --from=builder /code/requirements.txt .
-RUN pip install --no-cache /wheels/*
-RUN rm -rf /wheels
-
-ADD --chown=ocl:ocl . $APP_HOME
-
-USER ocl
+WORKDIR /code
+RUN pip install packaging
+RUN pip install -r requirements.txt
+ADD . /code/
 
 RUN chmod +x set_build_version.sh
 RUN ["bash", "-c", "./set_build_version.sh"]
@@ -42,5 +17,4 @@ RUN chmod +x start_celery_worker.sh
 RUN chmod +x ping_celery_worker.sh
 RUN chmod +x start_flower.sh
 EXPOSE 8000
-
 CMD ["bash", "-c", "./startup.sh"]

requirements.txt

@@ -1,6 +1,5 @@
 Django==3.1.12
 psycopg2==2.8.5
-gunicorn==20.1.0
 djangorestframework==3.11.2
 pylint==2.5.3
 pydash==4.8.0
@@ -18,7 +17,7 @@ celery[redis]==4.4.7
 celery_once==3.0.1
 flower==0.9.5
 redis==3.5.3
-kombu==4.6.11
+kombu==4.5.0
 django-elasticsearch-dsl==7.1.4
 drf-yasg==1.17.1
 git+https://github.com/snyaggarwal/django-queryset-csv

startup.sh

@@ -21,10 +21,5 @@ python manage.py import_lookup_values
 echo "Populating text from extras.about"
 python manage.py populate_text_from_extras_about
 
-if [[ "$ENVIRONMENT" = "development" ]]; then
-  echo "Starting up the development server"
-  python manage.py runserver 0.0.0.0:${API_PORT:-8000}
-else
-  echo "Starting up the production server"
-  gunicorn core.wsgi:application --bind 0.0.0.0:${API_PORT:-8000}
-fi
+echo "Starting up the server"
+python manage.py runserver 0.0.0.0:${API_PORT:-8000}