384 Commits

Author SHA1 Message Date
Salim Ibrahim
cba541bc59 bugfix: version inconsistent in config and rancher-compose. 2016-12-16 06:40:02 -05:00
Salim Ibrahim
19546bfe9f added drupal to community-catalog 2016-12-16 00:47:22 -05:00
Hussein Galal
aff3851ef5 Merge pull request #369 from rawmind0/master
Added cloud9 templates for cattle and k8s
2016-12-16 02:29:47 +02:00
Hussein Galal
35a59ad68f Merge pull request #367 from Rucknar/prom_update
Updated Prometheus catalog entry, 1.2 compatible
2016-12-16 01:27:10 +02:00
Raul Sanchez
e6d3d6e3f3 Added cloud9 templates for catlle and k8s 2016-12-15 18:30:20 +01:00
Edward Marshall
07f05370f6 Updated Prometheus catalog entry, 1.2 compatible 2016-12-13 10:11:15 +00:00
Òscar Casajuana
98ac20439d Added mumble (murmur) stack (#360)
* Added mumble (murmur) stack

* Set proper version
2016-12-12 22:08:16 +02:00
Hussein Galal
3d85bae5cc Merge pull request #365 from cloudnautique/update_secrets_bridge_v020
updated the catalog for the secrets-bridge v1.2.0 release
2016-12-12 20:35:58 +02:00
Antonio De Marinis
7bffa9210e make distinct templates for different versions for Plone (#363)
* make distinct templates for plone 4.3 and plone 5.0

* remove version variable from zeoserver as well
2016-12-12 19:43:21 +02:00
Mateusz Trojak
16859801eb Adding SonarQube Stack (#352)
* Adding SonarQube Stack

* Updating configuration
2016-12-12 19:29:46 +02:00
Bill Maxwell
ee01de0379 updated the catalog for the secrets-bridge v1.2.0 release 2016-12-12 10:25:49 -07:00
Denise
85ffaf7566 Merge pull request #355 from deniseschannon/efsupdates
Max version for convoy-efs
2016-12-05 20:51:36 -08:00
deniseschannon
6b5e5d4565 Max version for convoy-efs 2016-12-05 20:51:02 -08:00
Marco Mancini
44f004cd6a Added OpenNebula Machine-Driver (#315)
* Added OpenNebula Machine-Driver

* Added uiUrl

* Update OpenNebula logo
2016-12-03 04:24:08 +02:00
Raúl Sánchez
af47fda0c8 Merge pull request #349 from ovidiub13/updateJenkins
Update jenkins to v2.19.4
2016-12-02 17:02:11 +01:00
Ovidiu-Florin BOGDAN
c62acc916c Updated Jenkins to 2.19.4 2016-12-01 22:54:48 +02:00
Ovidiu-Florin BOGDAN
829938c139 Updated Jenkins version to 2.7.1 2016-12-01 22:48:56 +02:00
Ovidiu-Florin BOGDAN
6175b234b3 Copied template from 1.651.3 2016-12-01 22:47:01 +02:00
Denise
d6f392ab7f Merge pull request #348 from LLParse/swarmkit-1.12.3
swarm name/version changes
2016-11-30 16:20:03 -08:00
James Oliver
e9c435ea9a name/version changes 2016-11-30 17:18:41 -07:00
James Oliver
ec791c9acb Merge pull request #347 from LLParse/swarmkit-1.12.3
update swarmkit versions/readme
2016-11-30 16:54:07 -07:00
James Oliver
c3e114ffbd update swarmkit versions/readme 2016-11-30 16:53:35 -07:00
Raul Sanchez
8255c03123 Updated traefik templates to v 1.1.1 2016-11-30 01:46:52 +01:00
Raul Sanchez
febbf4c339 Updated kafka templates 2016-11-30 01:44:15 +01:00
Raul Sanchez
2c8c14b6af Updated zookeeper templates to v 3.4.9 2016-11-30 01:38:49 +01:00
Raúl Sánchez
41c2541e98 Merge pull request #278 from jmreicha/master
sysdig-cloud: Cut logs at custom size and make into a system service
2016-11-29 19:07:08 +01:00
Josh Reichardt
671046f0e1 Use consistent variables 2016-11-29 10:01:10 -08:00
Josh Reichardt
2b0eab6b19 Make log size adjustable 2016-11-28 17:16:46 -08:00
Raúl Sánchez
3c90c04005 Merge pull request #332 from zambon/minecraft-v1.11
Waste lots of time, with data persistence
2016-11-28 22:46:46 +01:00
Raúl Sánchez
fe3878d25a Merge pull request #303 from portworx/master
Bump version for px-dev to 1.0.6
2016-11-28 22:33:45 +01:00
Denise
82ad42a8ce Merge pull request #345 from deniseschannon/updates1
Updated mesos image back to original
2016-11-28 13:33:27 -08:00
deniseschannon
75848419aa Updated mesos image back to original 2016-11-28 13:32:24 -08:00
ununseptium
70dea3d980 update gitlab to latest version (#343)
* update gitlab to latest version

This should refer to the offical docker compose file of gitlab: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/docker/docker-compose.yml

* added option to select gitlab external_url prefix

This is needed so that rancher will put a correct uri scheme prefix to the ${gitlab_hostname} to the external_url.

* added external_url prefix

honestly i don't know if `${gitlab_omnipus_prefix}${gitlab_hostname}` will work since i cannot test it by myself right now, but imo that should work....

* changed version to latest

since image is going to be gitlab/gitlab-ce:latest, the version here inside the readme should reflect this.

* update to latest
2016-11-28 23:13:30 +02:00
Raúl Sánchez
4629ad81ce Merge pull request #317 from kbh2o/add_ldap_uid
Adding question for ldap bind uid
2016-11-28 22:04:00 +01:00
James Oliver
f75a7c8ed9 Merge pull request #344 from LLParse/mesos-cni
Mesos slave cni network model changes, parameterize mesos-master/zookeeper scale
2016-11-28 13:12:41 -07:00
James Oliver
fb7e4f8835 code review changes 2016-11-28 13:09:29 -07:00
James Oliver
24443a3424 cni network model changes 2016-11-28 12:06:30 -07:00
Denise
cc5f49e0fe Merge pull request #341 from deniseschannon/dnsupdates
Move mesos/swarm to infra-templates
2016-11-25 16:51:49 -08:00
deniseschannon
cf9afdd524 min version on mesos and swarm 2016-11-25 16:41:27 -08:00
Alin Voinea
9536763606 Add Plone to Rancher Community Catalog (#312)
* Add Plone

* Add port variable

* Add host affinity variable

* Add required fields

* Spread accross multiple nodes

* Typo fix

* Change category to CMS
2016-11-24 18:25:26 +02:00
Denise
4552eb0569 Merge pull request #340 from LLParse/mesos-cni
Mesos CNI changes
2016-11-23 23:02:42 -08:00
deniseschannon
74495c9ab5 Move mesos/swarm to infra-templates 2016-11-23 22:50:41 -08:00
James Oliver
16b7c0c578 cni network model changes 2016-11-23 20:45:08 -07:00
Raúl Sánchez
64d78df8d1 Merge pull request #338 from faddat/patch-4
Update weavescope version to 1.0.0
2016-11-23 17:11:48 -08:00
Jacob Gadikian
4c80a09055 Delete rancher-compose.yml
no longer needed
2016-11-24 08:01:08 +07:00
Jacob Gadikian
fe14726490 Delete docker-compose.yml
no longer needed
2016-11-24 08:00:53 +07:00
Jacob Gadikian
afa843eeef Update config.yml
version numbers
2016-11-24 08:00:08 +07:00
Jacob Gadikian
5eef1c2642 Update rancher-compose.yml
version numbers
2016-11-24 07:58:44 +07:00
Jacob Gadikian
ace10caee1 Update docker-compose.yml
update version numbers
2016-11-24 07:52:38 +07:00
James Oliver
2b2c8bd02f resolvable hostname 2016-11-23 17:45:13 -07:00