[Docker] v1 to v2, cherry-pick from test branch, resolving conflicts

diff --git a/app/bin/app.sh b/app/bin/app.sh
index 2940bfb5f934a965c8280680428d0178c00ef05e..79b54223bd668af6ff7982f5f8d55719aec37755 100755 (executable)
--- a/app/bin/app.sh
+++ b/app/bin/app.sh
@@ -25,7 +25,7 @@ gid='www-data'
 sh $app/bin/wait.sh
 
 # django setup
-python $manage wait-for-db
+#python $manage wait-for-db
 
 # initial setup
 if [ ! -f .init ]; then

diff --git a/app/bin/wait.sh b/app/bin/wait.sh
index 202c4d133d904b8b84c40cdddf5871ccf1990566..b1f392c6f122b2b49d9fd924f66f0a595433ccd3 100755 (executable)
--- a/app/bin/wait.sh
+++ b/app/bin/wait.sh
@@ -2,12 +2,11 @@
 
 set -e
 
-host=$(env | grep _TCP_ADDR | cut -d = -f 2)
-port=$(env | grep _TCP_PORT | cut -d = -f 2)
+port=$(env | grep POSTGRES_PORT | cut -d = -f 2)
 
 echo -n "waiting for TCP connection to $host:$port..."
 
-while ! nc -w 1 $host $port 2>/dev/null
+while ! nc -w 1 db $port 2>/dev/null
 do
   echo -n .
   sleep 1

diff --git a/app/settings.py b/app/settings.py
index 0e0eae79d92de01e1cd246a94e0719240aeb4827..dbc230b3da534100d38b70f4d4a61ee68c6992c6 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -218,13 +218,12 @@ LOCALE_PATHS = (
 #############
 # DATABASES #
 #############
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'postgres',
         'USER': 'postgres',
-        'PASSWORD': os.environ.get('DB_ENV_POSTGRES_PASSWORD'),
+        'PASSWORD': os.environ.get('POSTGRES_PASSWORD'),
         'HOST': 'db',
         'PORT': '5432',
     },

diff --git a/docker-compose.yml b/docker-compose.yml
index f7c0de17bfd6bb4a983a146defc0c988dee403e2..93b15c03f1259aa3a58812489714f401330f3733 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,32 +18,49 @@
 # Authors:
 # Guillaume Pellerin <guillaume.pellerin@ircam.fr>
 
-# version 1
+version: '2'
+services:
+    var:
+        image: debian:jessie
+        volumes:
+            - ./var/media:/srv/media
+            - ./var/backup:/srv/backup
+            - ./var/static:/srv/static
+            - ./var/log/uwsgi:/var/log/uwsgi
+            - ./var/log/nginx:/var/log/nginx
+            - ./var/log/app:/var/log/app
+            - ./var/log/cron:/var/log/cron
+            - ./bin:/srv/bin
+            - ./doc:/srv/doc
+            - /srv/bower
+        command: "true"
+    db:
+        image: postgres:9.5
+        volumes:
+            - ./var/lib/postgresql/data:/var/lib/postgresql/data
+        env_file:
+            - 'env/prod.env'
 
-var:
-    image: debian:jessie
-    volumes:
-        - ./var/media:/srv/media
-        - ./var/backup:/srv/backup
-        - ./var/static:/srv/static
-        - ./var/log/uwsgi:/var/log/uwsgi
-        - ./var/log/nginx:/var/log/nginx
-        - ./var/log/app:/var/log/app
-        - ./var/log/cron:/var/log/cron
-        - ./bin:/srv/bin
-        - ./doc:/srv/doc
-        - /srv/bower
-    command: "true"
-
-db:
-    image: postgres:9.5
-    volumes_from:
-        - var
-    volumes:
-        - ./var/lib/postgresql/data:/var/lib/postgresql/data
-    environment:
-        - POSTGRES_PASSWORD=noodFof2Kna
+    app:
+        image: ircamweb/mezzo:latest-dev
+        command: /bin/sh bin/app.sh --runserver
+        volumes:
+            - ./app:/srv/app
+            - ./lib:/srv/lib
+            - .git:/srv/.git
+        volumes_from:
+            - var
+        expose:
+            - "8000"
+        ports:
+            - "9001:8000" 
+        depends_on:
+            - var
+            - db
+        env_file:
+            - 'env/prod.env'
 
+<<<<<<< HEAD
 app:
     image: ircamweb/mezzo:latest-dev
     command: /bin/sh bin/app.sh --runserver
@@ -64,3 +81,12 @@ app:
 
 nginx:
     image: nginx
+=======
+    # nginx:
+    #     image: nginx
+
+volumes:
+    var:
+    app:
+    db:
+>>>>>>> 3a4cea9d... [Docker] : docker-compose from v1 to v2

diff --git a/env/dev.env b/env/dev.env
new file mode 100644 (file)
index 0000000..d8f775b
--- /dev/null
+++ b/env/dev.env
@@ -0,0 +1,3 @@
+POSTGRES_PASSWORD=noodFof2Kna
+POSTGRES_PORT=5432
+DEBUG=True
\ No newline at end of file

diff --git a/env/dev.yml b/env/dev.yml
index 71ba3ae0aa2e72c0ed0df58964a6ba907a9bb984..da610a046571c62ff84fc09d6875c6861ac8f864 100644 (file)
--- a/env/dev.yml
+++ b/env/dev.yml
@@ -1,8 +1,9 @@
-
-app:
-    image: ircamweb/mezzo:latest-dev
-    command: /bin/sh bin/app.sh --runserver
-    ports:
-        - "9000:8000"
-    environment:
-        - DEBUG=True
+version: '2'
+services:
+    app:
+        image: ircamweb/mezzo:latest-dev
+        command: /bin/sh bin/app.sh --runserver
+        ports:
+            - "9002:8000"
+        env_file:
+            - 'env/dev.env'

diff --git a/env/prod.env b/env/prod.env
new file mode 100644 (file)
index 0000000..4b03f5d
--- /dev/null
+++ b/env/prod.env
@@ -0,0 +1,3 @@
+POSTGRES_PASSWORD=noodFof2Kna
+POSTGRES_PORT=5432
+DEBUG=False
\ No newline at end of file

diff --git a/env/prod.yml b/env/prod.yml
index 6b747069b0b1e07ce724de02e933650e5951b484..b5b4e9a23653a7786139f9ab6044262b2002e294 100644 (file)
--- a/env/prod.yml
+++ b/env/prod.yml
@@ -1,4 +1,6 @@
 
-app:
-    command: /bin/sh bin/app.sh
+version: '2'
+services:
+    app:
+        command: /bin/sh bin/app.sh