From 0166b9454aad6092aa056bf3699fdee4b3ea272b Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 13 Jan 2016 12:35:40 +0100
Subject: [PATCH] add README, add db and web servers logs

---
 README.rst         | 39 +++++++++++++++++++++++++++++++++++++++
 docker-compose.yml | 11 +++++++----
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 README.rst

diff --git a/README.rst b/README.rst
new file mode 100644
index 00000000..d96d2fd1
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,39 @@
+================
+Manifeste IRCAM
+================
+
+This is the new template for the Manifeste festival website at IRCAM. It is based on the Mezzanine CMS which it itself based on Django.
+
+Install
+=========
+
+For easier development and production workflow, it has been dockerized including the MariaDB and the Nginx webserver.
+
+First install `Git <http://git-scm.com/downloads>`_, `Docker <https://docs.docker.com/installation/>`_ and `docker-compose <https://docs.docker.com/compose/install/>`_.
+
+Linux
+------
+
+Run these commands in a terminal::
+
+    git clone --recursive git://git.forge.ircam.fr/Manifeste.git
+    cd Manifeste
+    docker-compose up
+
+You should be able to browse the site at http://localhost:8000/
+
+MacOS or Windows:
+------------------
+
+Run these commands in a terminal::
+
+    docker-machine create --driver virtualbox manifeste
+    eval "$(docker-machine env manifeste)"
+    docker-machine ip manifeste
+    git clone --recursive git://git.forge.ircam.fr/Manifeste.git
+    cd Manifeste
+    docker-compose up
+
+The 3rd command should give you the IP of the VM. For example, if IP is 192.168.59.103, you should be able to browse the site at http://192.168.59.103:8000/
+
+`More info <https://docs.docker.com/>`_ about using docker and related tools.
diff --git a/docker-compose.yml b/docker-compose.yml
index 81badab9..e6d14b85 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,8 @@
 # Guillaume Pellerin <guillaume.pellerin@ircam.fr>
 
 
-media:
+data:
+  image: debian:jessie
   image: debian:jessie
   volumes:
      - ./data/media/:/srv/media
@@ -32,8 +33,9 @@ db:
   volumes:
     # - ./app/deploy/my.cnf:/etc/mysql/my.cnf
     - ./data/var/lib/mysql/:/var/lib/mysql
+    - ./data/var/log/mysql/:/var/log/mysql
   volumes_from:
-    - media
+    - data
   environment:
     - MYSQL_ROOT_PASSWORD=hyRob0otlaz4
     - MYSQL_DATABASE=manifeste
@@ -46,7 +48,7 @@ app:
   volumes:
     - ./app/:/srv/app
   volumes_from:
-    - media
+    - data
   expose:
     - "8000"
   links:
@@ -58,7 +60,8 @@ nginx:
     - "8000:80"
   volumes:
     - ./app/deploy/nginx-app.conf:/etc/nginx/conf.d/default.conf
+    - ./data/var/log/nginx/:/var/log/nginx
   volumes_from:
-    - media
+    - data
   links:
     - app
-- 
2.39.5