From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 9 Aug 2018 22:22:14 +0000 (+0200)
Subject: Add staging env, update pages
X-Git-Tag: 1.7.2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=04f766b59ec7fb827abe630b9b139ce037e41c99;p=telemeta.git

Add staging env, update pages
---

diff --git a/env/staging.yml b/env/staging.yml
new file mode 100644
index 00000000..e6f15bd5
--- /dev/null
+++ b/env/staging.yml
@@ -0,0 +1,43 @@
+    # -*- coding: utf-8 -*-
+    # -*- 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:
+  image: parisson/telemeta:latest-dev
+  env_file:
+    - env/prod.env
+  command: /bin/bash bin/app.sh
+  volumes:
+    - ./lib/TimeSide:/srv/lib/timeside
+
+worker:
+  image: parisson/telemeta:latest-dev
+  env_file:
+    - env/prod.env
+  volumes:
+    - ./lib/TimeSide:/srv/lib/timeside
+
+db:
+  volumes:
+    - ./bin/:/srv/bin
diff --git a/telemeta/pages b/telemeta/pages
index ec1e758b..6bd28050 160000
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit ec1e758bf72b617e8f2bc9f98c293ad17014c096
+Subproject commit 6bd28050dc7e96a8a226ea928a8e7b09b130be93