Use ircamweb/mezzo image by default, use localhost as default SMTP server, update...

diff --git a/app/local_settings.py b/app/local_settings.py
index 5d05c65fd5a0001e20e57922238ac20af02f0ab4..77a960b35eda158280564f7f2fc7103e03fd9463 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -62,7 +62,7 @@ ADMINS = (
 SECRET_KEY = "j1qa@u$5ktqr^0_kwh@-j@*-80t$)ht!4-=ybz1xc%@3+r(r&tzefoih"
 NEVERCACHE_KEY = "m)u^%r@uh#r3wu0&$=#$1ogx)uy4hv93^2lt%c3@xi=^gifoj8paozijdihazefd"
 
-EMAIL_HOST = '' # please specify your smtp server address
+EMAIL_HOST = 'localhost' # please specify your smtp server address
 EMAIL_PORT = '25'
 SERVER_EMAIL = 'no-reply@no-reply.org' # a no reply address
 DEFAULT_FROM_EMAIL = 'default@default.org' # another address, default one

diff --git a/bin b/bin
index c804367449ac41d3fd0af54dd96d5038965b06c4..aa01a18ac8211fc581f241b3c2e3f863ce08ab97 160000 (submodule)
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit c804367449ac41d3fd0af54dd96d5038965b06c4
+Subproject commit aa01a18ac8211fc581f241b3c2e3f863ce08ab97

diff --git a/docker-compose.yml b/docker-compose.yml
index 8e956b1cc4d8aa31ff34492fa03f9c5e579cf8e9..02a78ca2c5e48ce4e0df34d3bdd8f373a3b9056c 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,7 +42,7 @@ db:
     - POSTGRES_PASSWORD=noodFof2Kna
 
 app:
-  build: .
+  image: ircamweb/mezzo
   command: /bin/sh bin/app.sh --runserver
   volumes:
     - ./app:/srv/app

diff --git a/env/dev.yml b/env/dev.yml
index 0049fa922c8510ac30fa10be189fc8c89c36295b..45617a328e848f595411a82b719495ea0f1f393b 100644 (file)
--- a/env/dev.yml
+++ b/env/dev.yml
@@ -1,5 +1,6 @@
 
 app:
+  build: .
   ports:
     - "9040:8000"
   environment:

diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization
index 8c5ad697698500906e05d7ce7c793ff70d6cbb5b..9ec1ff06994f870f063dc435bb17a29d19f59144 160000 (submodule)
--- a/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@ -1 +1 @@
-Subproject commit 8c5ad697698500906e05d7ce7c793ff70d6cbb5b
+Subproject commit 9ec1ff06994f870f063dc435bb17a29d19f59144

diff --git a/lib/mezzanine-organization-themes b/lib/mezzanine-organization-themes
index f7dac7bfd936ff4507bb0780ed9e5892ada6fc92..001bb2532c1cd0765c11d7b1ed79f3d1cdb753bc 160000 (submodule)
--- a/lib/mezzanine-organization-themes
+++ b/lib/mezzanine-organization-themes
@@ -1 +1 @@
-Subproject commit f7dac7bfd936ff4507bb0780ed9e5892ada6fc92
+Subproject commit 001bb2532c1cd0765c11d7b1ed79f3d1cdb753bc