diff --git a/.gitmodules b/.gitmodules index d3a265d..61c6aa2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "dss.api"] path = dss.api url = git@github.com:fergalmoran/dss.api.git +[submodule "dss.web"] + path = dss.web + url = git@github.com:fergalmoran/dss.web.git diff --git a/docker-compose.yml b/docker-compose.yml index 62b374f..36cc46b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,3 +22,23 @@ data: volumes: - /var/lib/postgresql command: /bin/true + +web: + restart: always + build: ./dss.web + links: + - "redis:redis" + ports: + - "8080:8080" + +redis: + image: redis + +nginx: + restart: always + build: ./nginx/ + ports: + - "81:81" + links: + - "api:api" + - "web:web" diff --git a/dss.web b/dss.web new file mode 160000 index 0000000..505d34a --- /dev/null +++ b/dss.web @@ -0,0 +1 @@ +Subproject commit 505d34ac5fe35a0c7c9d84c743704a84d4a23650 diff --git a/nginx/Dockerfile b/nginx/Dockerfile new file mode 100644 index 0000000..2a99696 --- /dev/null +++ b/nginx/Dockerfile @@ -0,0 +1,3 @@ +FROM tutum/nginx +RUN rm /etc/nginx/sites-enabled/default +ADD sites-enabled/ /etc/nginx/sites-enabled diff --git a/nginx/sites-enabled/deepsouthsounds.com b/nginx/sites-enabled/deepsouthsounds.com new file mode 100644 index 0000000..b1b5921 --- /dev/null +++ b/nginx/sites-enabled/deepsouthsounds.com @@ -0,0 +1,18 @@ +server{ + listen 81; + server_name www.deepsouthsounds.com ext-test.deepsouthsounds.com deepsouthsounds.com; + + location /api { + proxy_pass http://api:8000; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + location / { + proxy_pass http://web:8080; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +}