Commit Graph

94 Commits

Author SHA1 Message Date
Fergal Moran
cb4b27fddc Fixed api cert 2016-02-03 10:41:28 +00:00
Fergal Moran
2ac0cf5c5d Added API cert 2016-02-02 21:31:03 +00:00
Fergal Moran
1dbf8b1d1e Changed dss keys 2016-02-02 21:27:36 +00:00
Fergal Moran
76cb285b94 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2016-02-02 20:47:17 +00:00
Fergal Moran
d1259a30d0 Added API cert 2016-02-02 20:46:53 +00:00
Fergal Moran
2abf269687 Added api certs 2016-02-02 20:42:03 +00:00
Fergal Moran
a04c936170 Merge conflicts 2016-02-02 20:15:59 +00:00
Fergal Moran
918191825d docker-compose 2016-02-02 20:15:14 +00:00
Fergal Moran
57d987e12a Re-enabled certificates 2016-02-02 20:14:35 +00:00
Fergal Moran
b9a8b67e8e Various stuff 2016-02-02 19:52:24 +00:00
Fergal Moran
645a211b52 Some changes 2015-12-06 16:59:41 +00:00
Fergal Moran
baf1400749 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-11-12 21:23:27 +00:00
Fergal Moran
47d5f96d83 Fixed host name in icecast 2015-11-12 21:23:06 +00:00
Fergal Moran
97c574730f Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-11-01 18:38:34 +00:00
Fergal Moran
e141a13f08 Fixed missing volume in nginx 2015-11-01 18:30:26 +00:00
Fergal Moran
38b30388b9 merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-11-01 14:35:57 +00:00
Fergal Moran
d0e6bd7099 Pre-merge 2015-11-01 14:35:55 +00:00
Fergal Moran
f41923c6af Moved to images 2015-11-01 14:31:47 +00:00
Fergal Moran
deb9895383 Moving to images 2015-11-01 14:26:26 +00:00
Fergal Moran
a307403034 Moved to images 2015-10-30 10:56:12 +00:00
Fergal Moran
6895cbea1a Merge branch 'master' of github.com:fergalmoran/dss.docker 2015-10-20 19:54:39 +01:00
Fergal Moran
dda53033f6 Edit 2015-10-20 19:54:36 +01:00
Fergal Moran
2eaee8bda9 Broke docker-compose 2015-10-20 18:51:32 +00:00
Fergal Moran
de4fd6f632 Merge branch 'master' of github.com:fergalmoran/dss.docker 2015-10-12 19:23:37 +01:00
Fergal Moran
5e4a8f0b15 Added deleted files 2015-10-12 18:23:17 +00:00
Fergal Moran
4f6a6cf900 Merge branch 'master' of github.com:fergalmoran/dss.docker 2015-10-11 22:22:06 +01:00
Fergal Moran
8954d6f845 Fixed mounts 2015-10-11 22:22:03 +01:00
Fergal Moran
58ac1af801 Fixed radio nginx 2015-10-11 21:21:41 +00:00
Fergal Moran
aa13ff1787 Merge branch 'master' of https://github.com/fergalmoran/dss.docker 2015-10-05 19:36:05 +00:00
Fergal Moran
db8058c536 Added icecast link to radio 2015-10-05 20:35:51 +01:00
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