Use official docker image, add build.yml building env, fix dockerignore paths

diff --git a/.dockerignore b/.dockerignore
index af1ea76ec70535c0b1d4d6dfbc3533a9e7baed84..f97a75b48384f8c01f3e035274bc0d06be91f1c0 100644 (file)
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,8 @@
 .git
 *.pyc
 *.egg-info
-build/
-dist/
-data/
-tmp/
+**/build
+**/dist
+data
+tmp
+var

diff --git a/docker-compose.yml b/docker-compose.yml
index d9bde39562d3fd435bd63602f313cf8d4a9a235e..71592a9ed854eacbc42f00a2304adb1014172deb 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,11 +50,10 @@ search:
   image: elasticsearch:1
 
 app:
-  build: .
+  image: parisson/telemeta:latest
   volumes:
     - ./app:/srv/app
     - ./telemeta:/srv/src/telemeta/telemeta
-    - ./lib/:/srv/src/plugins/ 
   volumes_from:
     - data
   env_file:
@@ -66,9 +65,10 @@ app:
     - search
 
 worker:
-  build: .
+  image: parisson/telemeta:latest
   volumes_from:
     - app
+    - data
   env_file:
     - env/prod.env
   command: /bin/bash scripts/worker.sh

diff --git a/env/build.yml b/env/build.yml
new file mode 100644 (file)
index 0000000..2a10c32
--- /dev/null
+++ b/env/build.yml
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2015-2016 Parisson SARL
+
+# This file is part of Telemeta.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
+# TimeSide is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with TimeSide.  If not, see <http://www.gnu.org/licenses/>.
+
+# Authors:
+# Guillaume Pellerin <yomguy@parisson.com>
+# Thomas Fillon <thomas@parisson.com>
+
+
+app:
+  build: .
+
+worker:
+  build: .

diff --git a/env/dev.yml b/env/dev.yml
index bcde1be4bb2974f872694c2d977bb5c212aa20f7..887b74c0bf60b11339d4f9b418c2706a11cc284f 100644 (file)
--- a/env/dev.yml
+++ b/env/dev.yml
@@ -23,6 +23,7 @@
 
 
 app:
+  image: image: parisson/telemeta:latest-dev
   env_file:
     - env/debug.env
   command: /bin/bash scripts/app.sh --runserver
@@ -30,6 +31,7 @@ app:
     - 9000:8000
 
 worker:
+  image: image: parisson/telemeta:latest-dev
   env_file:
     - env/debug.env
 

diff --git a/telemeta/locale b/telemeta/locale
index c3df358c0aaae94be1f288a3e3a67f6a94c9165f..e7fd56599e9e22eddf92c1063419fec6ab82e15e 160000 (submodule)
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit c3df358c0aaae94be1f288a3e3a67f6a94c9165f
+Subproject commit e7fd56599e9e22eddf92c1063419fec6ab82e15e