Add prestashopdb container, pull eve and prestashop modules from github

diff --git a/app/local_settings.py b/app/local_settings.py
index 7fa40f2d5655235fbe316301cfbc976c2e8640dc..574382f4d9bd6e2b854e3b2f2f20c234ee776c7a 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -27,7 +27,7 @@ DATABASES = {
         'HOST': 'eve',
         'PORT': '5432',
     },
-    'presta': {
+    'prestashop': {
         'ENGINE': 'django.db.backends.mysql',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'USER': 'ircam_shops',      # Not used with sqlite3.
         'PASSWORD': 'pUmt97e4MgR9EP4knyWea0n',  # Not used with sqlite3.

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 00c0cabf1749ae021f28d783381cacff5d58f83a..fc86c567d4ef38319a5efbfeb99b5dc689455bd2 100644 (file)
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -20,6 +20,7 @@ patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2'
 # Staging
 pip install xlrd
 # 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
 # pip install django-querysetsequence
 #pip install django-autocomplete-light django-querysetsequence

diff --git a/docker-compose.yml b/docker-compose.yml
index 0dc9634f67ffac30dd03c80c9026968be49b76cd..5be19e68ba73c3f91207cf2697aea005fac6b3ee 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,21 +38,35 @@ db:
   environment:
     - POSTGRES_PASSWORD=hyRob0otlaz4
 
+prestadb:
+  image: mariadb
+  volumes_from:
+    - data
+  volumes:
+    - ./scripts/:/srv/scripts
+    - ./data/mysql/:/var/lib/mysql
+  environment:
+    - MYSQL_ROOT_PASSWORD=mysecretpassword
+    - MYSQL_DATABASE=ircam_shops
+    - MYSQL_USER=ircam_shops
+    - MYSQL_PASSWORD=pUmt97e4MgR9EP4knyWea0n
+
 app:
   build: .
   command: /bin/bash scripts/app.sh
   volumes:
     - ./app/:/srv/app
+    - ./lib/grappelli-safe/:/srv/lib/grappelli-safe
     - ./lib/mezzanine-agenda/:/srv/lib/mezzanine-agenda
     - ./lib/django-eve/:/srv/lib/django-eve
     - ./lib/django-prestashop/:/srv/lib/django-prestashop
-    - ./lib/grappelli-safe/:/srv/lib/grappelli-safe
   volumes_from:
     - data
   expose:
     - "8000"
   links:
     - db
+    - prestadb
   environment:
    - DEBUG=False
 

diff --git a/lib/django-eve b/lib/django-eve
index cf5caf29cfc9c893a091290a54589789cb0ada7b..233efa6da1baefd9e7e657bce9fb36b8b41030e4 160000 (submodule)
--- a/lib/django-eve
+++ b/lib/django-eve
@@ -1 +1 @@
-Subproject commit cf5caf29cfc9c893a091290a54589789cb0ada7b
+Subproject commit 233efa6da1baefd9e7e657bce9fb36b8b41030e4

diff --git a/lib/django-prestashop b/lib/django-prestashop
index 1b7f9c30776907a7815109ec64f3347ab3c71705..cf223e92f2713e883ea5c44cc7d4c31a44566e9e 160000 (submodule)
--- a/lib/django-prestashop
+++ b/lib/django-prestashop
@@ -1 +1 @@
-Subproject commit 1b7f9c30776907a7815109ec64f3347ab3c71705
+Subproject commit cf223e92f2713e883ea5c44cc7d4c31a44566e9e

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 1723fe6c816ea25ce5fa63d744fe83feeface266..22df85d33f34b385184b291c73b24e5ab3486eab 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
 -e git+https://github.com/yomguy/mezzanine-agenda.git#egg=mezzanine-agenda-0.2.2
 -e git+https://github.com/yomguy/mezzanine.git@jquery#egg=mezzanine-4.2-dev
 -e git+https://github.com/yomguy/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2
-https://forge.ircam.fr/p/django-eve/source/download/dev/
-https://forge.ircam.fr/p/django-prestashop/source/download/master/
+-e git+https://github.com/yomguy/django-eve.git@dev#egg=django-eve-1.0
+-e git+https://github.com/yomguy/django-prestashop.git@dev#egg=django-prestashop-1.0