Commit Graph

64 Commits

Author SHA1 Message Date
Fergal Moran
92e993e979 Merge conflicts 2015-10-05 19:16:44 +00:00
Fergal Moran
e3e5add99b Removed pwd from Dockerfile 2015-10-05 20:16:19 +01:00
Fergal Moran
f2e6565317 Merge conflicts 2015-10-05 19:15:49 +00:00
Fergal Moran
4bdef0ae54 Pre merge 2015-10-05 19:15:19 +00:00
Fergal Moran
3d4ec73e99 Added radio 2015-10-05 20:14:47 +01:00
Fergal Moran
0226353107 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-10-01 18:35:18 +00:00
Fergal Moran
7c4fa3bce3 Added docker cleanup script 2015-10-01 19:35:11 +01:00
Fergal Moran
d83233c5ea Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-09-25 19:47:48 +00:00
Fergal Moran
54863fa353 Fixed some stuff 2015-09-25 20:47:42 +01:00
Fergal Moran
eebb1ea5e6 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-09-25 19:38:42 +00:00
Fergal Moran
152a575b68 Fixed some stuff 2015-09-25 20:38:36 +01:00
Fergal Moran
a8fb239b18 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-09-25 18:50:28 +00:00
Fergal Moran
6d97042b8a Altered ports 2015-09-25 19:50:21 +01:00
Fergal Moran
501b87a6d1 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-09-25 18:28:16 +00:00
Fergal Moran
55ca369e26 Removed radio from docker-compose 2015-09-25 19:28:08 +01:00
Fergal Moran
e274155caa Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-09-25 18:27:49 +00:00
Fergal Moran
93593edcb3 Removed radio from docker-compose 2015-09-25 19:27:41 +01:00
Fergal Moran
5e737433ae Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-09-25 18:14:03 +00:00
Fergal Moran
83a0bbd24b Added radio to docker compose 2015-09-25 19:13:24 +01:00
Fergal Moran
1547c57326 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-09-22 21:19:18 +00:00
Fergal Moran
559e9ab229 Removed symlink 2015-09-22 22:19:10 +01:00
Fergal Moran
37ae8c2fb1 Merge conflicts 2015-09-22 21:18:30 +00:00
Fergal Moran
2fcc8f70e4 Fixed .gitignore 2015-09-22 22:17:23 +01:00
Fergal Moran
febd3a36bb Fixed .gitignore 2015-09-22 21:17:00 +00:00
CoreOS Admin
f301528d80 Fixed stuff 2015-09-22 21:14:45 +00:00
CoreOS Admin
3c55b19576 Fixed .gitmodules 2015-09-22 21:13:35 +00:00
Fergal Moran
8d3b4e49b1 Fixed modules 2015-09-22 22:09:06 +01:00
Fergal Moran
16dfdc5f08 Added ports to docker-compose 2015-09-22 22:07:30 +01:00
Fergal Moran
5e8a534277 Added radio submodule 2015-09-22 22:06:27 +01:00
Fergal Moran
3e82582d2b Fixed wrong radio port 2015-09-20 22:53:16 +01:00
Fergal Moran
f33bf1312c Fixed exposed radio ports 2015-09-20 22:31:48 +01:00
Fergal Moran
767e6809af Added radio to nginx 2015-09-20 21:10:31 +01:00
Fergal Moran
4e778de8c6 Merge branch 'master' of github.com:fergalmoran/dss.docker 2015-09-20 20:49:42 +01:00
Fergal Moran
b74b585e65 Added radio stuff 2015-09-20 20:49:22 +01:00
CoreOS Admin
37e4786b26 Fixed root redirect in nginx 2015-09-17 18:19:10 +00:00
CoreOS Admin
df9b962686 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-08-25 19:38:13 +00:00
Fergal Moran
969804a019 Altered postgres build 2015-08-25 20:35:07 +01:00
Fergal Moran
8740ae3f20 Fixed gitignore 2015-08-25 19:41:06 +01:00
Fergal Moran
4dc5143b60 Fixes 2015-08-25 19:40:23 +01:00
Fergal Moran
ccd867eb44 Added postgres folder to build 2015-08-18 20:10:53 +01:00
CoreOS Admin
10bdd3cd3a Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-08-18 18:47:26 +00:00
Fergal Moran
f571ce2d76 Fixed nginx api port 2015-08-18 19:47:12 +01:00
CoreOS Admin
3c3b44a031 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-08-17 20:03:22 +00:00
Fergal Moran
c71eaf4f8e Fixed SSL 2015-08-17 21:03:13 +01:00
CoreOS Admin
79e7e6d927 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-08-17 19:29:28 +00:00
Fergal Moran
684378ecb5 Fixed volumes in nginx 2015-08-17 20:29:21 +01:00
CoreOS Admin
cac59a2303 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-08-17 19:12:46 +00:00
CoreOS Admin
66379549d7 Pre stash 2015-08-17 19:12:43 +00:00
Fergal Moran
55f5b9b039 Added ssl to nginx 2015-08-17 20:12:24 +01:00
Fergal Moran
30bb59f705 Fixed body size issue in nginx 2015-08-05 21:16:55 +01:00