From 53074509e4f0277b55b23ac236d13a6739958bd0 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 15 Feb 2018 12:41:31 +0100
Subject: [PATCH] Use official docker image, add build.yml building env, fix
 dockerignore paths

---
 .dockerignore      |  9 +++++----
 docker-compose.yml |  6 +++---
 env/build.yml      | 29 +++++++++++++++++++++++++++++
 env/dev.yml        |  2 ++
 telemeta/locale    |  2 +-
 5 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 env/build.yml

diff --git a/.dockerignore b/.dockerignore
index af1ea76e..f97a75b4 100644
--- 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 d9bde395..71592a9e 100644
--- 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
index 00000000..2a10c320
--- /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 25154156..0afc82c4 100644
--- 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 c3df358c..e7fd5659 160000
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit c3df358c0aaae94be1f288a3e3a67f6a94c9165f
+Subproject commit e7fd56599e9e22eddf92c1063419fec6ab82e15e
-- 
2.39.5