Merge conflicts

.gitignore

@@ -6,3 +6,5 @@ dss.radio
 api_env
 web_env
 radio_env
+
+logs/

docker-compose.yml

@@ -1,3 +1,18 @@
+data:
+  restart: "no"
+  image: postgres:9.4
+  volumes:
+    - /var/lib/postgresql
+  command: /bin/true
+
+postgres:
+    restart: "always"
+    image: postgres:9.4
+    volumes_from:
+        - data
+    ports:
+        - "5432:5432"
+
 rabbitmq:
     image: tutum/rabbitmq
     environment:
@@ -10,20 +25,20 @@ rabbitmq:
 redis:
     image: redis
 
-postgres:
+api:
-    restart: "always"
+   image: fergalmoran/dss.api
-    image: postgres:latest
-    volumes_from:
-        - data
-    ports:
-        - "5432:5432"
-
-data:
-  restart: "no"
-  image: postgres:latest
    volumes:
-    - /var/lib/postgresql
+     - /files
-  command: /bin/true
+   ports:
+     - "8001:8001"
+   env_file:
+       - ./api_env
+   links:
+       - postgres
+       - redis
+#       - icecast
+       - rabbitmq
+   command: ./run_web.sh
 
 icecast:
     build: ./icecast/
@@ -74,15 +89,28 @@ web:
     ports:
         - "8080:8080"
 
-radio:
+#icecast:
-    image: fergalmoran/dss.radio
+#    build: ./icecast/
-    env_file:
+#    volumes:
-        - ./radio_env
+#        - ./logs:/var/log/icecast2
-    ports:
+#        - /etc/localtime:/etc/localtime:ro
-        - "8888:8888"
+#    environment:
-    links:
+#        - ICECAST_SOURCE_PASSWORD=RDzNlgqmj67vk
-        - "icecast:icecast"
+#        - ICECAST_ADMIN_PASSWORD=CrVuP5evoJZ0
-        - "api:api"
+#        - ICECAST_RELAY_PASSWORD=9PmUbI1mLne9o
+#    ports:
+#        - 8000:8000
+
+#radio:
+#    image: fergalmoran/dss.radio
+#    env_file:
+#        - ./radio_env
+#    ports:
+#        - "8888:8888"
+#    links:
+#        - "icecast:icecast"
+#        - "api:api"
+
 nginx:
     restart: "always"
     build: ./nginx/
@@ -92,7 +120,8 @@ nginx:
     links:
         - "api:api"
         - "web:web"
-        - "icecast:icecast"
+ #       - "icecast:icecast"
-        - "radio:radio"
+ #       - "radio:radio"
     volumes_from:
         - api
+

get_compose

@@ -0,0 +1,4 @@
+#!/bin/bash
+mkdir -p /opt/bin
+curl -L `curl -s https://api.github.com/repos/docker/compose/releases/latest | jq -r '.assets[].browser_download_url | select(contains("Linux") and contains("x86_64"))'` > /opt/bin/docker-compose
+chmod +x /opt/bin/docker-compose

nginx/sites-enabled/deepsouthsounds.com

@@ -1,21 +1,21 @@
-server {
+#server {
-    listen 80;
+#    listen 80;
-    server_name radio.deepsouthsounds.com;
+#    server_name radio.deepsouthsounds.com;
-    
+#    
-    location /a {
+#    location /a {
-        proxy_pass http://radio:8888;
+#        proxy_pass http://radio:8888;
-        proxy_set_header Host $host;    
+#        proxy_set_header Host $host;    
-        proxy_set_header X-Real-IP $remote_addr;
+#        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+#        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
+#    }
-
+#
-    location / {
+#    location / {
-        proxy_pass http://icecast:8000;
+#        proxy_pass http://icecast:8000;
-        proxy_set_header Host $host;    
+#        proxy_set_header Host $host;    
-        proxy_set_header X-Real-IP $remote_addr;
+#        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+#        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
+#    }
-}
+#}
 
 server {
     listen 80;