Update to Alpine:3.6 (and python3.6)

Need to include a hack to solve a problem with running runserver
in python3.6. Check for more info:

docker-library/python#211

Author: Jaime Buelta

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 ARG django_secret_key
 ENV DJANGO_SECRET_KEY $django_secret_key
@@ -9,6 +9,9 @@ RUN apk add --update postgresql-libs
 RUN apk add --update curl
 # Add envsubts
 RUN apk add --update gettext
+# Add nginx
+RUN apk add --update nginx
+RUN mkdir -p /run/nginx
 
 RUN mkdir -p /opt/code
 WORKDIR /opt/code
@@ -21,11 +24,21 @@ ADD ./deps /opt/deps
 # Only install them if there's any
 RUN if ls /opt/vendor/*.whl 1> /dev/null 2>&1; then pip3 install /opt/vendor/*.whl; fi
 
+# Add uwsgi and nginx configuration
+RUN mkdir -p /opt/server
+RUN mkdir -p /opt/static
+
+
+# Add fix for stack for Python3.6
+ADD ./docker/server/stack-fix.c /opt/server
+
 # Some Docker-fu. In one step install the compile packages, install the
 # dependencies and then remove them. That skims the image size quite
 # sensibly.
 RUN apk add --no-cache --virtual .build-deps \
   python3-dev build-base linux-headers gcc postgresql-dev \
+    # Hack to fix the problem with runserver
+    && gcc  -shared -fPIC /opt/server/stack-fix.c -o /opt/server/stack-fix.so \
     # Installing python requirements
     && pip3 install -r requirements.txt \
     && find /usr/local \
@@ -45,11 +58,6 @@ RUN apk add --no-cache --virtual .build-deps \
     && apk del .build-deps
 
 
-# Add uwsgi and nginx configuration
-RUN mkdir -p /opt/server
-RUN mkdir -p /opt/static
-RUN apk add --update nginx
-RUN mkdir -p /run/nginx
 ADD ./docker/server/uwsgi.ini.template /opt/server
 ADD ./docker/server/nginx.conf.template /opt/server
 ADD ./docker/server/start_server.sh /opt/server

docker-compose.yaml

@@ -44,6 +44,8 @@ services:
         command: /opt/copy_deps.sh
     dev-server:
         env_file: environment.env
+        environment:
+            - CONSOLE_LOGS=1
         build: 
             context: .
             args:

docker/db/Dockerfile

@@ -1,5 +1,4 @@
-# FROM rlesouef/alpine-postgres
-FROM alpine:3.5
+FROM alpine:3.6
 
 # Add the proper env variables for init the db
 ARG POSTGRES_DB

docker/deps/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 RUN mkdir -p /opt/vendor
 WORKDIR /opt/vendor
 RUN apk update

docker/log/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 RUN apk add --update syslog-ng
 

docker/server/stack-fix.c

@@ -0,0 +1,33 @@
+#include <dlfcn.h>
+#include <pthread.h>
+#include <stdio.h>
+
+// THIS IS TO AVOID A SIGFAULT WHEN RUNNING python3.6 manage.py runserver
+// This should be fixed at some point by Alpine and/or Python
+// Check this issue for more info
+// https://github.com/docker-library/python/issues/211
+typedef int (*func_t)(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg);
+
+int pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg) {
+	printf("XXX pthread_create override called.\n");
+
+	pthread_attr_t local;
+	int used = 0, ret;
+
+	if (!attr) {
+		used = 1;
+		pthread_attr_init(&local);
+		attr = &local;
+	}
+	pthread_attr_setstacksize((void*)attr, 2 * 1024 * 1024); // 2 MB
+
+	func_t orig = (func_t)dlsym(RTLD_NEXT, "pthread_create");
+
+	ret = orig(thread, attr, start_routine, arg);
+
+	if (used) {
+		pthread_attr_destroy(&local);
+	}
+
+	return ret;
+}

docker/system-test/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 RUN apk add --update python3 py3-pip pytest
 RUN mkdir -p /opt/system-test

requirements.txt

@@ -1,5 +1,5 @@
 uwsgi==2.0.15
-Django==1.11
+Django==1.11.4
 pytest-django==3.1.2
 psycopg2==2.7.3
 djangorestframework==3.6.3

src/start_dev_server.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
 python3 manage.py migrate -v 3
+# Preload hack to avoid sigfault
+export LD_PRELOAD=/opt/server/stack-fix.so
 python3 manage.py runserver 0.0.0.0:80

src/templatesite/settings.py

@@ -25,6 +25,11 @@
 formatter = logging.Formatter('SETTINGS %(levelname)-8s %(message)s')
 handler.setFormatter(formatter)
 settings_logger.addHandler(handler)
+# Log settings also in stdout
+handler = logging.StreamHandler()
+handler.setFormatter(formatter)
+settings_logger.addHandler(handler)
+
 settings_logger.setLevel(logging.INFO)
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)