Merge pull request #680 from usrpro/feat-startup

Standarize images

core/admin/Dockerfile

@@ -1,24 +1,28 @@
-FROM python:3-alpine
-
+FROM alpine:3.8
+# python3 shared with most images
+RUN apk add --no-cache \
+    python3 py3-pip \
+  && pip3 install --upgrade pip
+# Image specific layers under this line
 RUN mkdir -p /app
 WORKDIR /app
 
 COPY requirements-prod.txt requirements.txt
 RUN apk add --no-cache openssl curl \
- && apk add --no-cache --virtual build-dep openssl-dev libffi-dev python-dev build-base \
- && pip install -r requirements.txt \
+ && apk add --no-cache --virtual build-dep openssl-dev libffi-dev python3-dev build-base \
+ && pip3 install -r requirements.txt \
  && apk del --no-cache build-dep
 
 COPY mailu ./mailu
 COPY migrations ./migrations
 COPY manage.py .
-COPY start.sh /start.sh
+COPY start.py /start.py
 
 RUN pybabel compile -d mailu/translations
 
 EXPOSE 80/tcp
 VOLUME ["/data"]
 
-CMD ["/start.sh"]
+CMD /start.py
 
 HEALTHCHECK CMD curl -f -L http://localhost/ui || exit 1

core/admin/start.py

@@ -0,0 +1,7 @@
+#!/usr/bin/python3
+
+import os
+
+os.system("python3 manage.py advertise")
+os.system("python3 manage.py db upgrade")
+os.system("gunicorn -w 4 -b :80 --access-logfile - --error-logfile - --preload mailu:app")

core/admin/start.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-python manage.py advertise
-python manage.py db upgrade
-gunicorn -w 4 -b :80 --access-logfile - --error-logfile - --preload mailu:app