Use telemeta image, upgrade docker api

diff --git a/Dockerfile b/Dockerfile
index 9c271d52cec26f43c82b8f21db93da36adbf7cce..f83610d3bbb2c158faa78a49b5c1e5fcd3974419 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM python:2
+FROM parisson/telemeta:latest-dev
 
 MAINTAINER Guillaume Pellerin <yomguy@parisson.com>
 

diff --git a/docker-compose.yml b/docker-compose.yml
index b6290e4ded1f92ef109d29eebea0fc667206e82a..c52632d5813f755a05dee1a58f474337b61d7707 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,43 +1,53 @@
-data:
-  image: debian:jessie
-  volumes:
-     - ./var/media/:/srv/media
-     - ./var/static/:/srv/static
-     - ./var/backup/:/srv/backup
-  command: "true"
+version: '3'
 
-db:
-  image: mariadb
-  environment:
-    - MYSQL_ROOT_PASSWORD=mysecretpassword
-    - MYSQL_DATABASE=teleforma
-    - MYSQL_USER=teleforma
-    - MYSQL_PASSWORD=admin
-  volumes:
-    - ./data/var/lib/mysql/:/var/lib/mysql
-    - ./data/var/log/mysql/:/var/log/mysql
+services:
+  var:
+    image: debian:jessie
+    volumes:
+      - ./var/media/:/srv/media
+      - ./var/static/:/srv/static
+      - ./var/backup/:/srv/backup
+    command: "true"
 
-app:
-  build: .
-  command: /bin/sh deploy/start_app.sh
-  volumes:
-    - ./app/:/srv/app
-    - ./teleforma/:/srv/lib/teleforma/teleforma
-  volumes_from:
-    - data
-  ports:
-    - "8000:8000"
-  links:
-    - db
+  db:
+    image: mariadb:10
+    environment:
+      - MYSQL_ROOT_PASSWORD=mysecretpassword
+      - MYSQL_DATABASE=teleforma
+      - MYSQL_USER=teleforma
+      - MYSQL_PASSWORD=admin
+    volumes:
+      - ./var/lib/mysql/:/var/lib/mysql
+
+  app:
+    build: .
+    command: /bin/sh deploy/start_app.sh
+    volumes:
+      - ./app/:/srv/app
+      - ./teleforma/:/srv/lib/teleforma/teleforma
+    volumes_from:
+      - var
+    ports:
+      - "8000:8000"
+    links:
+      - db
+
+  web:
+    image: nginx
+    ports:
+      - "80:80"
+    volumes:
+      - ./app/deploy/nginx-app.conf:/etc/nginx/conf.d/default.conf
+      - ./var/log/nginx/:/var/log/nginx
+    volumes_from:
+      - var
+    links:
+      - app
+
+
+volumes:
+    var:
+    app:
+    db:
+    web:
 
-nginx:
-  image: nginx
-  ports:
-    - "80:80"
-  volumes:
-    - ./app/deploy/nginx-app.conf:/etc/nginx/conf.d/default.conf
-    - ./data/var/log/nginx/:/var/log/nginx
-  volumes_from:
-    - data
-  links:
-    - app

diff --git a/requirements.txt b/requirements.txt
index 391d319ab404e2e992725b9bf18e54360b9e5165..0898302088788960324b46f166638abf88218a5f 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
 setuptools
-django==1.4.19
-telemeta==1.4.6
-south
+django==1.8.*
+telemeta==1.7.1
 django-pagination==1.0.7
 django-postman==3.2.0
 django-extensions==0.9