Move docker stuff in dedicated repo (https://github.com/tracim/docker_tracim.git)

README.md

@@ -446,84 +446,6 @@ Example of Apache WSGI configuration. This configuration refers to productionapp
         LogLevel debug
     </VirtualHost>
 
-## Docker
-
-### Build images
-
-To build tests designed image
-
-    docker build -t tracim:tests docker/Debian_Tests
-
-To build Prod/dev designed image
-
-    docker build -t tracim:latest docker/Debian_Uwsgi
-
-### Run containers
-
-#### Run tests containers
-
-Run tests with PostgreSQL
-
-    docker run -e TEST_DATABASE_ENGINE=postgresql tracim:tests
-
-Run tests with MySQL
-
-    docker run -e TEST_DATABASE_ENGINE=mysql tracim:tests
-
-Run tests with SQLite
-
-    docker run -e TEST_DATABASE_ENGINE=sqlite tracim:tests
-
-##### Run test on specific commit/branch
-
-To run tests on specific branch or commit, use ``CHECKOUT`` parameter, eg:
-
-    docker run -e TEST_DATABASE_ENGINE=postgresql -e CHECKOUT=<branch_or_commit_name> tracim:tests
-
-##### Other parameters (environment variables)
-
-* FETCH: (0 or 1) Apply a ``git fetch origin`` on tracim repository
-* PULL: (0 or 1) Apply a ``git pull origin master`` on tracim repository to set tracim on latest master branch
-
-#### Run Prod/dev containers
-
-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
-
-Volumes are:
-
-* /etc/tracim
-* /var/tracim (used for SQLite database and radicale)
-
-Ports are:
-
-* 80 (industracim web interface)
-
-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 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 80:80 -v /tmp/tracim:/etc/tracim tracim:latest
-
-Example with SQLite
-
-    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 #
 
 Building the community is a work in progress.

docker/Debian_Tests/Dockerfile

@@ -1,52 +0,0 @@
-FROM debian:jessie
-MAINTAINER contact@algoo.fr
-
-# TODO: See GOOD PRATICE (remove apt lists, cache, etc)
-
-# Install required packages
-RUN apt-get update -q \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
-      git \
-      locales \
-      realpath \
-      python3 \
-      python3-dev \
-      python3-pip \
-      build-essential \
-      libxml2-dev \
-      libxslt1-dev \
-      python-lxml \
-      postgresql-server-dev-all \
-      postgresql \
-      postgresql-client \
-      uwsgi \
-      uwsgi-plugin-python3 \
-      postgresql-server-dev-all \
-      postgresql \
-      postgresql-client \
-      mysql-server \
-      mysql-client \
-      libmysqlclient-dev \
-      sqlite3 \
-      default-jdk
-
-# Ensure UTF-8
-RUN locale-gen en_US.UTF-8 en_us \
-    && dpkg-reconfigure locales \
-    && locale-gen C.UTF-8 \
-    && /usr/sbin/update-locale LANG=C.UTF-8
-ENV LANG C.UTF-8
-ENV LANGUAGE C.UTF-8
-ENV LC_ALL C.UTF-8
-
-# Download and install Tracim
-RUN git clone https://github.com/tracim/tracim.git \
-     && cd /tracim/tracim \
-     && python3 setup.py develop \
-     && cd /tracim \
-     && pip3 install -r install/requirements.txt \
-     && pip3 install https://launchpad.net/oursql/py3k/py3k-0.9.4/+download/oursql-0.9.4.zip \
-     && echo 20161216001
-
-COPY entrypoint.sh /tracim/entrypoint.sh
-CMD ["/tracim/entrypoint.sh"]

docker/Debian_Tests/entrypoint.sh

@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# ENVIRONMENT VARIABLES ARE:
-#
-# * TEST_DATABASE_ENGINE (values: postgresql, mysql, sqlite)
-# * CHECKOUT (values: a commit or branch name)
-# * PULL (values: 0 or 1)
-# * FETCH (values: 0 or 1)
-#
-
-# Default values
-FETCH=${FETCH:=1}
-PULL=${PULL:=1}
-
-# If PULL is set, change repository HEAD
-if [ "$FETCH" = 1 ]; then
-    cd /tracim && git fetch origin
-fi
-
-
-# If PULL is set, change repository HEAD
-if [ "$PULL" = 1 ]; then
-    cd /tracim && git pull origin master
-fi
-
-# If CHECKOUT is set, change repository HEAD
-if [ -n "$CHECKOUT" ]; then
-    cd /tracim && git checkout ${CHECKOUT}
-    echo "CHECKOUT set to $CHECKOUT"
-fi
-
-# Ensure TEST_DATABASE_ENGINE is set
-if ! [ -n "$TEST_DATABASE_ENGINE" ]; then
-    echo "You must set TEST_DATABASE_ENGINE environment variable"
-    exit 1
-fi
-
-# Ensure TEST_DATABASE_ENGINE value
-case "$TEST_DATABASE_ENGINE" in
-    postgresql|mysql|sqlite) ;;
-    *) echo "TEST_DATABASE_ENGINE environment variable must be one of these: \
-postgresql, mysql, sqlite" ; exit 1 ;;
-esac
-
-# Prepare config files
-cp /tracim/tracim/development.ini.base /tracim/tracim/development.ini
-cp /tracim/tracim/wsgidav.conf.sample /tracim/tracim/wsgidav.conf
-
-# PostgreSQL case
-if [ "$TEST_DATABASE_ENGINE" = postgresql ] ; then
-    service postgresql start
-    su - postgres -s /bin/bash -c "psql -c \"CREATE DATABASE tracim;\""
-    su - postgres -s /bin/bash -c "psql -c \"ALTER USER postgres WITH PASSWORD 'dummy';\""
-    sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = postgresql:\/\/postgres:dummy@127.0.0.1:5432\/tracim?client_encoding=utf8/" /tracim/tracim/test.ini
-    sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = postgresql:\/\/postgres:dummy@127.0.0.1:5432\/tracim?client_encoding=utf8/" /tracim/tracim/development.ini
-fi
-
-# MySQL case
-if [ "$TEST_DATABASE_ENGINE" = mysql ] ; then
-    service mysql start
-    mysql -e 'CREATE DATABASE tracim;'
-    sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = mysql+oursql:\/\/root@localhost\/tracim/" /tracim/tracim/test.ini
-    sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = mysql+oursql:\/\/root@localhost\/tracim/" /tracim/tracim/development.ini
-fi
-
-# SQLite case
-if [ "$TEST_DATABASE_ENGINE" = sqlite ] ; then
-    sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = sqlite:\/\/\/tracim.sqlite/" /tracim/tracim/test.ini
-    sed -i "s/\(sqlalchemy.url *= *\).*/\sqlalchemy.url = sqlite:\/\/\/tracim.sqlite/" /tracim/tracim/development.ini
-fi
-
-# Run tests
-cd /tracim/tracim && nosetests -c /tracim/tracim/test.ini -v

docker/Debian_Uwsgi/Dockerfile

@@ -1,69 +0,0 @@
-FROM debian:jessie
-MAINTAINER contact@algoo.fr
-
-# TODO: See GOOD PRATICE (remove apt lists, cache, etc)
-
-# Install required packages
-RUN apt-get update -q \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
-      git \
-      locales \
-      realpath \
-      python3 \
-      python3-dev \
-      python3-pip \
-      build-essential \
-      libxml2-dev \
-      libxslt1-dev \
-      python-lxml \
-      postgresql-server-dev-all \
-      postgresql \
-      postgresql-client \
-      uwsgi \
-      uwsgi-plugin-python3 \
-      mysql-client \
-      libmysqld-dev \
-      sqlite3 \
-      nginx \
-      redis-server
-
-# Ensure UTF-8
-RUN locale-gen en_US.UTF-8 en_us \
-    && dpkg-reconfigure locales \
-    && locale-gen C.UTF-8 \
-    && /usr/sbin/update-locale LANG=C.UTF-8
-ENV LANG C.UTF-8
-ENV LANGUAGE C.UTF-8
-ENV LC_ALL C.UTF-8
-
-# Download and install Tracim
-RUN git clone https://github.com/tracim/tracim.git \
-     && cd /tracim/tracim \
-     && python3 setup.py develop \
-     && cd /tracim \
-     && pip3 install -r install/requirements.txt\
-     && pip3 install https://launchpad.net/oursql/py3k/py3k-0.9.4/+download/oursql-0.9.4.zip \
-     && echo 20161216001
-
-# Prepare volumes
-RUN mkdir /etc/tracim \
-    && mkdir /var/tracim \
-    && mkdir /var/tracim/logs \
-    && mkdir /var/tracim/assets
-VOLUME ["/etc/tracim", "/var/tracim"]
-
-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/check_env_vars.sh

@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-# Ensure DATABASE_TYPE is set
-if ! [ -n "$DATABASE_TYPE" ]; then
-    echo "You must set DATABASE_TYPE environment variable"
-    exit 1
-fi
-
-if ! [ "$DATABASE_TYPE" = sqlite ]; then
-    # Ensure DATABASE_USER is set
-    if ! [ -n "$DATABASE_USER" ]; then
-        echo "You must set DATABASE_USER environment variable"
-        exit 1
-    fi
-
-    # Ensure DATABASE_PASSWORD is set
-    if ! [ -n "$DATABASE_PASSWORD" ]; then
-        echo "You must set DATABASE_PASSWORD environment variable"
-        exit 1
-    fi
-
-    # Ensure DATABASE_HOST is set
-    if ! [ -n "$DATABASE_HOST" ]; then
-        echo "You must set DATABASE_HOST environment variable"
-        exit 1
-    fi
-
-    # Ensure DATABASE_NAME is set
-    if ! [ -n "$DATABASE_NAME" ]; then
-        echo "You must set DATABASE_NAME environment variable"
-        exit 1
-    fi
-
-    # Ensure DATABASE_TYPE value
-    case "$DATABASE_TYPE" in
-        postgresql|mysql|sqlite) ;;
-        *) echo "DATABASE_TYPE environment variable must be one of these: \
-    postgresql, mysql, sqlite" ;;
-    esac
-fi

docker/Debian_Uwsgi/entrypoint.sh

@@ -1,125 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# ENVIRONMENT VARIABLES ARE:
-#
-# * DATABASE_TYPE (values: postgresql, mysql, sqlite)
-# * DATABASE_USER
-# * DATABASE_PASSWORD
-# * DATABASE_HOST
-# * DATABASE_PORT
-# * DATABASE_NAME
-# * PULL
-#
-
-# Default values
-# TODO: Voir avec Damien si c'est le comportement souhaité
-PULL=${PULL:=1}
-CONFIG_FILE_IS_NEW=0
-
-# 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
-    echo "Upgrade Tracim code"
-    cd /tracim && git pull origin master
-fi
-
-# Create config.ini file if no exist
-if [ ! -f /etc/tracim/config.ini ]; then
-    CONFIG_FILE_IS_NEW=1
-    cp /tracim/tracim/development.ini.base /etc/tracim/config.ini
-fi
-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 -sf /etc/tracim/wsgidav.conf /tracim/tracim/wsgidav.conf
-
-# MySQL case
-if [ "$DATABASE_TYPE" = mysql ] ; then
-    # Ensure DATABASE_PORT is set
-    if ! [ -n "$DATABASE_PORT" ]; then
-        DATABASE_PORT=3306
-    fi
-    # engine is mysql+oursql
-    DATABASE_TYPE=mysql+oursql
-
-    # Check if database must be init
-    TEST_TABLE=$(mysql --host="$DATABASE_HOST" --user="$DATABASE_USER" --password="$DATABASE_USER" --database="$DATABASE_NAME" -s -N --execute="SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '$DATABASE_NAME' AND table_name = 'content';")
-    if [ ${TEST_TABLE} = 0 ] ; then
-        INIT_DATABASE=true
-    fi
-fi
-
-# PostgreSQL case
-if [ "$DATABASE_TYPE" = postgresql ] ; then
-    # Ensure DATABASE_PORT is set
-    if ! [ -n "$DATABASE_PORT" ]; then
-        DATABASE_PORT=5432
-    fi
-    DATABASE_SUFFIX="?client_encoding=utf8"
-
-    # Check if database must be init
-    TEST_TABLE=$(PGPASSWORD="$DATABASE_PASSWORD" psql -U ${DATABASE_USER} -h ${TEST_TABLE} -d ${DATABASE_NAME} -t -c "SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'content' );")
-    if [ ${TEST_TABLE} = f ] ; then
-        INIT_DATABASE=true
-    fi
-fi
-
-# SQLite case
-if [ "$DATABASE_TYPE" = sqlite ] ; then
-    if [ ! -f /var/tracim/tracim.db ]; then
-        INIT_DATABASE=true
-    fi
-fi
-
-# Some configs are require if it's a fresh config file
-if [ "$CONFIG_FILE_IS_NEW" = 1 ] ; then
-    # Update radicale file system folder config
-    sed -i "s/\(# radicale.server.filesystem.folder *= *\).*/radicale.server.filesystem.folder = \/var\/tracim\/radicale/" /etc/tracim/config.ini
-    # Update secret
-    # TODO: test it
-    SECRET=$(python -c "import uuid; print(str(uuid.uuid4()))")
-    sed -i "s/\(cookie_secret *= *\).*/cookie_secret = $SECRET/" /etc/tracim/config.ini
-    sed -i "s/\(beaker.session.secret *= *\).*/beaker.session.secret = $SECRET/" /etc/tracim/config.ini
-    sed -i "s/\(beaker.session.validate_key *= *\).*/beaker.session.validate_key = $SECRET/" /etc/tracim/config.ini
-fi
-
-# Update sqlalchemy.url config
-if ! [ "$DATABASE_TYPE" = sqlite ] ; then
-    sed -i "s/\(sqlalchemy.url *= *\).*/\\sqlalchemy.url = $DATABASE_TYPE:\/\/$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOST:$DATABASE_PORT\/$DATABASE_NAME$DATABASE_SUFFIX/" /etc/tracim/config.ini
-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
-fi
-
-# Upgrade database
-if [ "$PULL" = 1 ]; then
-    echo "Upgrade Tracim database if required"
-    cd /tracim/tracim/ && gearbox migrate upgrade
-fi
-
-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

@@ -1,53 +0,0 @@
-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

@@ -1,7 +0,0 @@
-[uwsgi]
-plugins = python3
-chdir = /tracim/tracim
-module = wsgi
-callable = application
-enable-threads = true
-socket = /var/run/uwsgi/app/tracim/socket

docker/Debian_Uwsgi/wsgi.py

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-APP_CONFIG = '{{ instance.tracim_config_file_path }}'
-
-# Setup logging
-import logging
-import logging.config
-logging.config.fileConfig('/tracim/tracim/config.ini')
-
-from paste.deploy import loadapp
-application = loadapp('config:/tracim/tracim/config.ini')
-application.debug = False