Modify docker image to run nginx in front of tracim, webdav and radicale

README.md

@@ -115,6 +115,8 @@ You'll need to install the following packages on your Operating System:
 
     apt-get install git realpath python3 python-virtualenv python3-dev python-pip build-essential libxml2-dev libxslt1-dev python-lxml
 
+You also need `redis-server` package if you want to send email in async mode.
+
 ## Database ##
 
 If you want use PostgreSQL as database engine:
@@ -487,13 +489,16 @@ To run tests on specific branch or commit, use ``CHECKOUT`` parameter, eg:
 
 Environment variables are:
 
+* PULL (0 or 1): If 1, upgrade tracim at startup
 * DATABASE_TYPE (values: postgresql, mysql, sqlite)
+
+If DATABASE_TYPE is `postgresql` or `mysql`, please set these variables:
+
 * DATABASE_USER
 * DATABASE_PASSWORD
 * DATABASE_HOST
 * DATABASE_PORT
 * DATABASE_NAME
-* PULL (0 or 1): If 1, upgrade tracim at startup
 
 Volumes are:
 
@@ -503,21 +508,21 @@ Volumes are:
 Ports are:
 
 * 80 (industracim web interface)
-* 3060 (webdav)
-* 5232 (caldav)
 
 To run tracim container with MySQL or PostgreSQL, you must set environment ``DATABASE_USER, DATABASE_PASSWORD, DATABASE_HOST, DATABASE_PORT, DATABASE_NAME`` variable.
 Example with PostgreSQL:
 
-    docker run -e DATABASE_TYPE=postgresql -e DATABASE_USER=tracim -e DATABASE_PASSWORD=tracim -e DATABASE_HOST=192.168.1.2 -e DATABASE_NAME=tracim -p 127.0.0.1:80:80 -p 127.0.0.1:3060:3060 -p 127.0.0.1:5232:5232 -v /tmp/tracim:/etc/tracim tracim:latest
+    docker run -e DATABASE_TYPE=postgresql -e DATABASE_USER=tracim -e DATABASE_PASSWORD=tracim -e DATABASE_HOST=192.168.1.2 -e DATABASE_NAME=tracim -p 80:80 -v /tmp/tracim:/etc/tracim tracim:latest
 
 Example with MySQL
 
-    docker run -e DATABASE_TYPE=mysql -e DATABASE_USER=tracim -e DATABASE_PASSWORD=tracim -e DATABASE_HOST=192.168.1.2 -e DATABASE_NAME=tracim -p 127.0.0.1:80:80 -p 127.0.0.1:3060:3060 -p 127.0.0.1:5232:5232 -v /tmp/tracim:/etc/tracim tracim:latest
+    docker run -e DATABASE_TYPE=mysql -e DATABASE_USER=tracim -e DATABASE_PASSWORD=tracim -e DATABASE_HOST=192.168.1.2 -e DATABASE_NAME=tracim -p 80:80 -v /tmp/tracim:/etc/tracim tracim:latest
 
 Example with SQLite
 
-    docker run -e DATABASE_TYPE=sqlite -p 127.0.0.1:80:80 -p 127.0.0.1:3060:3060 -p 127.0.0.1:5232:5232 -v /tmp/tracim:/etc/tracimetc -v /tmp/tracimvar:/var/tracim tracim:latest
+    docker run -e DATABASE_TYPE=sqlite -p 80:80 -v /tmp/tracim:/etc/tracimetc -v /tmp/tracimvar:/var/tracim tracim:latest
+
+After execute one of these command, tracim will be available on your system on port 80.
 
 # Support and Community #
 

docker/Debian_Uwsgi/Dockerfile

@@ -23,7 +23,9 @@ RUN apt-get update -q \
       uwsgi-plugin-python3 \
       mysql-client \
       libmysqld-dev \
-      sqlite3
+      sqlite3 \
+      nginx \
+      redis-server
 
 # Ensure UTF-8
 RUN locale-gen en_US.UTF-8 en_us \
@@ -45,12 +47,23 @@ RUN git clone https://github.com/tracim/tracim.git \
 
 # Prepare volumes
 RUN mkdir /etc/tracim \
-    && mkdir /var/tracim
+    && mkdir /var/tracim \
+    && mkdir /var/tracim/logs \
+    && mkdir /var/tracim/assets
 VOLUME ["/etc/tracim", "/var/tracim"]
 
-COPY uwsgi.ini /tracim/tracim/uwsgi.ini.template
+COPY uwsgi.ini /etc/tracim/uwsgi.ini
+COPY nginx.conf /etc/tracim/nginx.conf
 COPY wsgi.py /tracim/tracim/wsgi.py
 COPY check_env_vars.sh /tracim/check_env_vars.sh
 COPY entrypoint.sh /tracim/entrypoint.sh
 
+RUN ln -s /etc/tracim/uwsgi.ini /etc/uwsgi/apps-available/tracim.ini && \
+    ln -s /etc/uwsgi/apps-available/tracim.ini /etc/uwsgi/apps-enabled/tracim.ini && \
+    ln -s /etc/tracim/nginx.conf /etc/nginx/sites-available/tracim.conf && \
+    ln -s /etc/nginx/sites-available/tracim.conf /etc/nginx/sites-enabled/tracim.conf && \
+    chown root:www-data -R /var/tracim/logs && \
+    chmod 775 -R /var/tracim/logs && \
+    rm /etc/nginx/sites-enabled/default
+
 CMD ["/tracim/entrypoint.sh"]

docker/Debian_Uwsgi/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# TODO: generate cookie secrent (if not yet done)
+# TODO: generate cookie secret (if not yet done)
 # TODO: run uwsgi as other user
 # TODO: Gestion des migrations
 # TODO: Verbosite des logs ?
@@ -23,6 +23,9 @@ PULL=${PULL:=1}
 
 # Check environment variables
 /tracim/check_env_vars.sh
+if [ ! "$?" = 0 ]; then
+    exit 1
+fi
 
 # If PULL is set, change repository HEAD
 if [ "$PULL" = 1 ]; then
@@ -34,18 +37,13 @@ fi
 if [ ! -f /etc/tracim/config.ini ]; then
     cp /tracim/tracim/development.ini.base /etc/tracim/config.ini
 fi
-ln -s /etc/tracim/config.ini /tracim/tracim/config.ini
+ln -sf /etc/tracim/config.ini /tracim/tracim/config.ini
 
 # Create wsgidav.conf file if no exist
 if [ ! -f /etc/tracim/wsgidav.conf ]; then
     cp /tracim/tracim/wsgidav.conf.sample /etc/tracim/wsgidav.conf
 fi
-ln -s /etc/tracim/wsgidav.conf /tracim/tracim/wsgidav.conf
-
-# Create uwsgi file if no exist
-if [ ! -f /etc/tracim/uwsgi.ini ]; then
-    cp /tracim/tracim/uwsgi.ini.template /etc/tracim/uwsgi.ini
-fi
+ln -sf /etc/tracim/wsgidav.conf /tracim/tracim/wsgidav.conf
 
 # MySQL case
 if [ "$DATABASE_TYPE" = mysql ] ; then
@@ -95,6 +93,9 @@ else
     sed -i "s/\(sqlalchemy.url *= *\).*/\\sqlalchemy.url = sqlite:\/\/\/\/var\/tracim\/tracim.db/" /etc/tracim/config.ini
 fi
 
+# Start redis server (for async email sending if configured)
+service redis-server start
+
 # Initialize database if needed
 if [ "$INIT_DATABASE" = true ] ; then
     cd /tracim/tracim/ && gearbox setup-app -c config.ini
@@ -102,9 +103,17 @@ fi
 
 # Upgrade database
 if [ "$PULL" = 1 ]; then
-    echo "Upgrade Tracim database id required"
+    echo "Upgrade Tracim database if required"
     cd /tracim/tracim/ && gearbox migrate upgrade
 fi
 
-# Start with uwsgi
-uwsgi --http-socket 0.0.0.0:80 /etc/tracim/uwsgi.ini
+service nginx start
+
+ln -sf /var/log/uwsgi/app/tracim.log /var/tracim/logs/uwsgi.log
+ln -sf /var/log/nginx/access.log /var/tracim/logs/nginx-access.log
+ln -sf /var/log/nginx/error.log /var/tracim/logs/nginx-error.log
+mkdir -p /var/run/uwsgi/app/tracim/
+chown www-data:www-data -R /var/run/uwsgi
+chown www-data:www-data -R /var/tracim
+
+uwsgi -i /etc/uwsgi/apps-available/tracim.ini --uid www-data --gid www-data

docker/Debian_Uwsgi/nginx.conf

@@ -0,0 +1,53 @@
+server {
+    listen 80 default_server;
+    server_name _;
+    charset     utf-8;
+
+    client_max_body_size 75M;
+
+    location /caldav {
+        proxy_pass http://127.0.0.1:5232;
+        proxy_set_header Host $http_host;
+    }
+
+    location /webdav {
+        proxy_pass http://127.0.0.1:3030;
+        proxy_set_header Host $http_host;
+    }
+
+    location /favicon.ico {
+        alias /tracim/tracim/tracim/public/favicon.ico;
+    }
+
+    location /assets {
+        root /tracim/tracim/tracim/public;
+        try_files $uri @default_assets;
+    }
+
+    location @default_assets {
+        root /var/tracim;
+    }
+
+    location / {
+        uwsgi_pass  unix:/var/run/uwsgi/app/tracim/socket;
+
+        # Give HTTP info to uwsgi/python
+        uwsgi_param  SCRIPT_NAME        '';
+        uwsgi_param  QUERY_STRING       $query_string;
+        uwsgi_param  REQUEST_METHOD     $request_method;
+        uwsgi_param  CONTENT_TYPE       $content_type;
+        uwsgi_param  CONTENT_LENGTH     $content_length;
+
+        uwsgi_param  REQUEST_URI        $request_uri;
+        uwsgi_param  PATH_INFO          $document_uri;
+        uwsgi_param  DOCUMENT_ROOT      $document_root;
+        uwsgi_param  SERVER_PROTOCOL    $server_protocol;
+        uwsgi_param  REQUEST_SCHEME     $scheme;
+        uwsgi_param  HTTPS              $https if_not_empty;
+
+        uwsgi_param  REMOTE_ADDR        $remote_addr;
+        uwsgi_param  REMOTE_PORT        $remote_port;
+        uwsgi_param  SERVER_PORT        $server_port;
+        uwsgi_param  SERVER_NAME        $server_name;
+    }
+}

docker/Debian_Uwsgi/uwsgi.ini

@@ -4,3 +4,4 @@ chdir = /tracim/tracim
 module = wsgi
 callable = application
 enable-threads = true
+socket = /var/run/uwsgi/app/tracim/socket