Tidy up docker setup

Author: alexmojaki

Dockerfile

@@ -11,31 +11,26 @@ RUN npm run build
 # Stage 2 - Setup server
 FROM ubuntu:18.04
 
-RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+RUN apt-get update
+
+RUN apt-get install -y software-properties-common curl
+RUN (cd /etc/apt/trusted.gpg.d/ && curl -O https://www.postgresql.org/media/keys/ACCC4CF8.asc)
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)"-pgdg main >  /etc/apt/sources.list.d/pgdg.list
+RUN apt-get update
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
     python3.8-dev \
-    unzip \
-    nginx \
-    curl \
     vim \
     python3.8-distutils \
-    gcc
+    gcc \
+    postgresql-client-12 \
+    libpq-dev
 
 RUN ln -s /usr/bin/python3.8 /usr/local/bin/python
-RUN python --version
 RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
 RUN python get-pip.py
-RUN pip --version
 RUN pip install poetry
 
-RUN apt-get install -y software-properties-common
-RUN (cd /etc/apt/trusted.gpg.d/ && curl -O https://www.postgresql.org/media/keys/ACCC4CF8.asc)
-RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)"-pgdg main >  /etc/apt/sources.list.d/pgdg.list
-RUN apt-get update -y
-RUN apt-get install -y postgresql-client-12 libpq-dev
-
-#RUN curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.deb.sh | bash
-
 WORKDIR /usr/src/app
 COPY poetry.lock pyproject.toml ./
 RUN poetry config virtualenvs.create false
@@ -46,8 +41,6 @@ COPY ./backend ./backend
 WORKDIR /usr/src/app/backend
 RUN ./manage.py collectstatic --noinput
 
-COPY ./backend/nginx.conf /etc/nginx
-
 EXPOSE 3000
 
 CMD ["bash", "./entrypoint.sh"]

backend/book/settings.py

@@ -33,8 +33,6 @@
 
 GITHUB_TOKEN = os.environ.get('GITHUB_TOKEN')
 
-SEPARATE_WORKER_PROCESS = os.environ.get('SEPARATE_WORKER_PROCESS', 'False')[0].upper() == 'T'
-
 ALLOWED_HOSTS = [
     'alexmojaki.pythonanywhere.com',
     os.environ.get('HEROKU_APP_NAME', '') + '.herokuapp.com',

backend/entrypoint.sh

@@ -1,17 +1,16 @@
 #!/usr/bin/env bash
-set -ex
 
-#nginx
+set -eux
 
 # We probably don't want this to be automatic but it makes life a lot easier
 # For setting up the cloud
 python manage.py migrate
 python manage.py init_db
 
-# Prevent outdated from making http requests
-echo '["0.2.0", "2099-01-01 00:00:00"]' > /tmp/outdated_cache_outdated 
-echo '["0.8.3", "2099-01-01 00:00:00"]' > /tmp/outdated_cache_birdseye
+# If no MASTER_URL is set, start a server in this container,
+# which the web server will contact by default
+if [ -z ${MASTER_URL+x} ]; then
+  ./master_server.sh &
+fi
 
-gunicorn --bind 127.0.0.1:5000 main.workers.master:app --access-logfile - --error-log - --threads 10 --worker-class gthread &
-
-gunicorn -c gunicorn_config.py book.wsgi:application --bind 0.0.0.0:${PORT:-3000}
+gunicorn -c gunicorn_config_web.py book.wsgi:application --bind 0.0.0.0:${PORT:-3000}

backend/gunicorn_config.py

@@ -0,0 +1,4 @@
+worker_class = 'gevent'
+keepalive = 60
+accesslog = '-'
+errorlog = '-'

backend/gunicorn_config_web.py

@@ -0,0 +1,5 @@
+bind = "0.0.0.0:5000"
+threads = 10
+worker_class = "gthread"
+accesslog = '-'
+errorlog = '-'

backend/gunicorn_config_worker.py

@@ -12,5 +12,6 @@
     send_default_pii=True
 )
 
-CLOUDAMQP_URL = os.environ.get('CLOUDAMQP_URL')
 SEPARATE_WORKER_PROCESS = os.environ.get('SEPARATE_WORKER_PROCESS', 'False')[0].upper() == 'T'
+
+MASTER_URL = os.environ.get('MASTER_URL', "http://localhost:5000/")

backend/main/simple_settings.py

@@ -118,9 +118,6 @@ def run_server():
     app.run(host="0.0.0.0")
 
 
-master_url = "http://localhost:5000/"
-
-
 @lru_cache()
 def master_session():
     import requests
@@ -136,7 +133,7 @@ def master_session():
         # Wait until alive
         while True:
             try:
-                session.get(master_url + "health")
+                session.get(simple_settings.MASTER_URL + "health")
                 break
             except requests.exceptions.ConnectionError:
                 sleep(1)
@@ -146,7 +143,7 @@ def master_session():
 
 def worker_result(entry):
     session = master_session()
-    return session.post(master_url + "run", json=entry).json()
+    return session.post(simple_settings.MASTER_URL + "run", json=entry).json()
 
 
 if __name__ == '__main__':

backend/main/workers/master.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# Prevent outdated from making http requests
+echo '["0.2.0", "2099-01-01 00:00:00"]' >/tmp/outdated_cache_outdated
+echo '["0.8.3", "2099-01-01 00:00:00"]' >/tmp/outdated_cache_birdseye
+
+gunicorn -c gunicorn_config_worker.py main.workers.master:app

backend/master_server.sh

@@ -13,17 +13,19 @@ services:
     environment:
       SEPARATE_WORKER_PROCESS: 'True'
       DATABASE_URL: postgres://postgres:pass@database/postgres
+      DEBUG: 'False'
+      MASTER_URL: http://master:5000/
     stdin_open: true
     tty: true
-#  worker:
-#    image: python-init
-#    build: .
-#    env_file: .env
-#    stdin_open: true
-#    tty: true
-#    entrypoint: gunicorn --threads 10 --bind 0.0.0.0:5000  main.workers.master:app
-#    ports:
-#      - 5000:5000
+  master:
+    image: python-init
+    build: .
+    env_file: .env
+    stdin_open: true
+    tty: true
+    entrypoint: ./master_server.sh
+    ports:
+      - 5000:5000
   database:
     image: postgres:12
     volumes: