From: CRI - IRCAM <cri@ircam.fr>
Date: Mon, 16 Jan 2017 12:37:34 +0000 (+0100)
Subject: Fix prod port, use build image
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2cb8eeadb71806fcce01974034b251217c365439;p=mezzo.git

Fix prod port, use build image
---

diff --git a/app/bin/app.sh b/app/bin/app.sh
index 9b5ea8d1..5d9fcf0d 100755
--- a/app/bin/app.sh
+++ b/app/bin/app.sh
@@ -19,7 +19,7 @@ gid='www-data'
 # patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2'
 
 # Staging
-# pip install xlrd
+pip install pandas xlwt
 # pip install -U https://forge.ircam.fr/p/django-eve/source/download/dev/
 # pip install https://forge.ircam.fr/p/django-prestashop/source/download/master/ --src /srv/lib
 # pip install -U https://github.com/stephenmcd/grappelli-safe/archive/dynamic_stacked.zip
diff --git a/docker-compose.yml b/docker-compose.yml
index 33f11432..e081a594 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,7 +42,7 @@ db:
     - POSTGRES_PASSWORD=hyRob0otlaz4
 
 app:
-  image: ircamwww_app
+  build: .
   command: /bin/bash bin/app.sh
   volumes:
     - ./app:/srv/app
@@ -64,7 +64,7 @@ app:
 nginx:
   image: nginx
   ports:
-    - "80:80"
+    - "8020:80"
   volumes:
     - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
   volumes_from:
diff --git a/lib/mezzanine b/lib/mezzanine
index 51cf69d9..86b75673 160000
--- a/lib/mezzanine
+++ b/lib/mezzanine
@@ -1 +1 @@
-Subproject commit 51cf69d973848f08bc482022fd5bdac9a41f8ff9
+Subproject commit 86b75673db4567f0e7907874717bfbbfc91c64ad
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 68122847..9f85fe27 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 681228473598a8fa8273711c65aa55636ec08fd1
+Subproject commit 9f85fe2741614bbdf1109296390f978a9cae1708
diff --git a/var b/var
index 235e624c..d7851a17 160000
--- a/var
+++ b/var
@@ -1 +1 @@
-Subproject commit 235e624c75ae8da81e6166e596be214ba96d41d7
+Subproject commit d7851a176bc89b767d0c99eb677202381b673841