1
0
Commit Graph

54 Commits

Author SHA1 Message Date
Sido Haakma
58d943603d Merge branch 'add-nexus-support' of p281392/molgenis-ops-rancher into master 2018-04-10 22:22:10 +02:00
sido
474bdb4496 fix(docker-compose.yml): update service name 2018-04-10 22:15:13 +02:00
Sido Haakma
72258ca87c Merge branch 'add-nexus-support' of p281392/molgenis-ops-rancher into master 2018-04-10 22:13:45 +02:00
sido
02aabd3792 fix(rancher-compose.yml): updated questions 2018-04-10 22:12:54 +02:00
Sido Haakma
28f3b7ccc5 Merge branch 'add-nexus-support' of p281392/molgenis-ops-rancher into master 2018-04-10 22:08:09 +02:00
sido
8ba7d05f9c feat(nexus): add nexus support 2018-04-10 22:05:47 +02:00
Sido Haakma
4b5f0fd476 Merge branch 'add-jenkins' of p281392/molgenis-ops-rancher into master 2018-04-05 21:13:11 +02:00
sido
0304d00b05 chore(prometheus): removed prometheus from add-jenkins branch 2018-03-27 10:09:07 +02:00
Sido Haakma
2afa07dc2a Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-23 15:12:20 +01:00
sido
6ed19d1777 fix(volume): map molgenis home directory to volume 2018-03-23 14:58:52 +01:00
sido
510e86b130 chore(molgenis.home): updated default value 2018-03-23 14:34:40 +01:00
Sido Haakma
64b93d375c Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-23 14:10:59 +01:00
sido
5bfde40628 chore(flow): added flow to project 2018-03-23 14:07:19 +01:00
sido
8ffc5745db feat(jenkins): added jenkins build servers 2018-03-23 08:50:38 +01:00
sido
6246828433 fix(docker-compose): added environment variables 2018-03-22 08:49:37 +01:00
Sido Haakma
d9e5e62be0 Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-17 23:07:19 +01:00
sido
9ac3fe1439 fix(docker-compose): fix molgenis admin password 2018-03-17 23:06:40 +01:00
sido
caf4feb06f fix(rancher-compose): fixed versioning 2018-03-17 22:49:08 +01:00
Sido Haakma
984437d2e6 Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-17 22:30:04 +01:00
sido
56653bf9b1 fix(docker-compose): turn off global scheduling 2018-03-17 22:29:32 +01:00
Sido Haakma
3ba33df854 Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-17 22:24:09 +01:00
sido
bb0c6d2597 feat(docker-compose): updated all volumes to local drivers 2018-03-17 22:23:23 +01:00
Sido Haakma
52ef079d0c Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-17 22:09:27 +01:00
sido
9334c55e04 feat(docker-compose): updated docker-compose with volumes 2018-03-17 22:08:07 +01:00
Sido Haakma
9ea048e7c4 Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-17 22:00:03 +01:00
sido
747809d5a2 fixc(rancher-compose): updated questions and added them into docker-compose 2018-03-17 21:59:29 +01:00
Sido Haakma
daf0489269 Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-17 21:50:02 +01:00
sido
2b2aabddce fix(docker-compose) added services tag 2018-03-17 21:49:33 +01:00
Sido Haakma
aa9f4f20ea Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-17 21:43:16 +01:00
sido
687cd33d9d chore(docker-compose): updated services names 2018-03-17 21:42:53 +01:00
sido
9f5f3f0806 feat(docker-compose): moved back to volume mappings 2018-03-17 21:34:02 +01:00
Sido Haakma
ad37c534f6 Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-15 10:10:57 +01:00
sido
6177319164 chore(docker-compose): add schema name and clustername to variable list 2018-03-15 10:09:50 +01:00
Sido Haakma
67323a5917 Merge branch 'add-latest-and-stable' of p281392/molgenis-ops-rancher into master 2018-03-15 07:47:52 +01:00
sido
5965a184a8 fix(docker-compose): added admin.password 2018-03-15 00:27:48 +01:00
sido
cb70fb6982 fix(docker-compose): replaced latest and stable at the right compose file 2018-03-15 00:25:21 +01:00
sido
f832f9806e chore(0 and 1): added latest and stable tag 2018-03-15 00:20:13 +01:00
Sido Haakma
1056e442c3 Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-13 10:25:49 +01:00
sido
fcac809118 fix(docker-compose): updated indenting for opencpu 2018-03-13 10:25:17 +01:00
Sido Haakma
34b9b9cfc8 Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-13 10:22:11 +01:00
sido
daed363e62 Merge branch 'master' of https://git.webhosting.rug.nl/molgenis/molgenis-ops-rancher 2018-03-13 10:21:06 +01:00
sido
b736e0537b fix(docker-compose): replaced : with = 2018-03-13 10:20:57 +01:00
sido
bd50d4b931 fix(docker-compose): added environment properties to start molgenis 2018-03-13 10:20:20 +01:00
Sido Haakma
d8a1233fd3 Merge branch 'master' of p281392/molgenis-ops-rancher into master 2018-03-11 23:04:50 +01:00
sido
5bc0fdef43 fix(docker-compose.yml): updated registries for opencpu and postgres (2.0.1) 2018-03-11 22:58:14 +01:00
sido
1120395003 fix(docker-compose): fixed version numbers 2018-03-10 22:00:52 +01:00
sido
40b912ff00 feat(added new versions): added version 6 and 7 to the molgenis catalogue 2018-03-10 12:25:59 +01:00
sido
9682aa79c5 fix(traefik environment): added labels for traefik 2018-03-09 10:46:39 +01:00
sido
49f38cf8da fix(added options): added domain options to catalogue 2018-03-09 08:14:43 +01:00
sido
3fb94926a2 fix(added version 6): added version 6 to catalogue 2018-03-09 08:03:13 +01:00