Update build process

Author: quorth0n

Dockerfile

@@ -87,13 +87,13 @@ mvt-pg-update:
 
 # Docker images
 image: ## Build backend:latest image
-	docker build -t chronmaps/backend:latest .
+	docker build -t chronmaps/backend:latest -f docker/Dockerfile .
 
 push-image: ## Push backend:latest image
 	docker push chronmaps/backend:latest
 
 python-image: ## Build image with python dependencies
-	docker build -t chronmaps/backend:deps-python -f Dockerfile.python .
+	docker build -t chronmaps/backend:deps-python -f docker/Dockerfile.python .
 
 push-python: ## Push python image
 	docker push chronmaps/backend:deps-python
@@ -102,8 +102,8 @@ check-python-image:
 	docker run --entrypoint md5sum chronmaps/backend:deps-python /requirements.txt| sed 's%/%config/%' | md5sum --check -
 
 system-image: ## Build alpine with dependencies
-	docker build -t chronmaps/backend:deps-base -f Dockerfile.base .
-	docker build -t chronmaps/backend:deps-build -f Dockerfile.build .
+	docker build -t chronmaps/backend:deps-base -f docker/Dockerfile.base .
+	docker build -t chronmaps/backend:deps-build -f docker/Dockerfile.build .
 
 push-system: ## Push alpine with dependencies
 	docker push chronmaps/backend:deps-base

Dockerfile.base

@@ -0,0 +1,15 @@
+FROM chronmaps/backend:deps-python as python
+
+LABEL maintainer="Mikhail Orlov <[email protected]>"
+
+RUN mkdir /config /src
+
+COPY ./project /src
+WORKDIR /src
+EXPOSE 80
+
+COPY ./docker/docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
+
+ENTRYPOINT /docker-entrypoint.sh $0 $@
+CMD ["gunicorn chron.wsgi -b 0.0.0.0:80 -t 300"]

Dockerfile.python

@@ -0,0 +1,30 @@
+FROM python:3-alpine as base
+# chronmaps/backend:deps-base
+
+LABEL maintainer="Mikhail Orlov <[email protected]>"
+
+ENV PYTHONUNBUFFERED=1 \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONFAULTHANDLER=1 \
+    PYTHONHASHSEED=random \
+    PIP_NO_CACHE_DIR=off \
+    PIP_DISABLE_PIP_VERSION_CHECK=on \
+    PIP_DEFAULT_TIMEOUT=100 \
+    POETRY_VERSION=1.1.13 \
+    POETRY_HOME="/opt/poetry" \
+    POETRY_VIRTUALENVS_IN_PROJECT=true \
+    POETRY_NO_INTERACTION=1 \
+    PYSETUP_PATH="/opt/pysetup" \
+    VENV_PATH="/opt/pysetup/.venv"
+ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
+
+ENV ALPINE_MIRROR "http://dl-cdn.alpinelinux.org/alpine"
+RUN echo "${ALPINE_MIRROR}/edge/main" >> /etc/apk/repositories
+
+RUN set -ex \
+    && apk add --no-cache \
+      postgresql-libs binutils graphviz \
+    && apk add --no-cache --repository ${ALPINE_MIRROR}/edge/community \
+      gdal-dev geos-dev
+
+ENTRYPOINT /bin/sh

Makefile

@@ -4,8 +4,8 @@ FROM chronmaps/backend:deps-base as base
 LABEL maintainer="Mikhail Orlov <[email protected]>"
 
 RUN set -ex \
-    && apk add --no-cache \ 
-      alpine-sdk libressl postgresql-dev linux-headers pcre-dev \
+    && apk add --no-cache \
+      postgresql-dev linux-headers pcre-dev gcc musl-dev libffi-dev alpine-sdk libressl zlib-dev jpeg-dev \
     && apk add --no-cache --repository ${ALPINE_MIRROR}/edge/community \
       proj-dev
 

config/requirements.txt

@@ -0,0 +1,18 @@
+FROM chronmaps/backend:deps-build as build
+# chronmaps/backend:deps-python
+
+LABEL maintainer="Mikhail Orlov <[email protected]>"
+
+RUN pip install "poetry==$POETRY_VERSION" 
+
+WORKDIR $PYSETUP_PATH
+COPY pyproject.toml poetry.lock ./
+RUN poetry install
+
+# TODO: create dev stage that runs linting etc, --no-dev in production
+
+FROM chronmaps/backend:deps-base as prod 
+
+COPY --from=build $VENV_PATH $VENV_PATH
+
+ENTRYPOINT /bin/sh

docker/Dockerfile

@@ -0,0 +1,23 @@
+#!/bin/ash
+
+set -e
+
+dbname=$POSTGRES_DB
+host="db"
+port="5432"
+user=$POSTGRES_USER
+passwd=$POSTGRES_PASSWORD
+
+. /opt/pysetup/.venv/bin/activate
+
+>&2 echo "Waiting for Postgres..."
+
+python wait_for_pg.py $dbname $host $port $user $passwd
+
+>&2 echo "Postgres is up - executing command"
+
+python manage.py makemigrations
+python manage.py migrate
+python manage.py collectstatic --noinput
+
+exec "$@"