From 6417c87134f7c0ead312ace2f7227684e68f61ac Mon Sep 17 00:00:00 2001 From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl> Date: Mon, 27 Mar 2017 01:43:41 +0200 Subject: [PATCH] Merge branch 'master' into czr_pythons_pg # Conflicts: # .gitlab-ci.yml --- cass_zk_rmq/README.md | 11 +++++++++++ cassandra/README.md | 9 +++++++++ czr_pythons/README.md | 11 +++++++++++ czr_pythons_pg/README.md | 2 ++ nodejs4/README.md | 10 ++++++++++ nodejs5_jdk_adk25/README.md | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+) diff --git a/cass_zk_rmq/README.md b/cass_zk_rmq/README.md index f8fdb2e..132a79e 100644 --- a/cass_zk_rmq/README.md +++ b/cass_zk_rmq/README.md @@ -1,3 +1,14 @@ +# cass_zk_mq + +Cassandra, ZooKeeper, RabbitMQ + +Added: +* curl +* Sun Java 8 +* Apache Cassandra 3.0.9 +* ZooKeeper +* RabbitMQ 3.3.5 (management plugin disabled) + --- diff --git a/cassandra/README.md b/cassandra/README.md index cf67210..cb653ab 100644 --- a/cassandra/README.md +++ b/cassandra/README.md @@ -1,3 +1,12 @@ +# cassandra + +Debian Jessie x86_64 with Cassandra 3.0.9 + +Added: +* curl +* Sun Java 8 +* Apache Cassandra 3.0.9 + --- diff --git a/czr_pythons/README.md b/czr_pythons/README.md index 8f8cbe3..e712699 100644 --- a/czr_pythons/README.md +++ b/czr_pythons/README.md @@ -1,3 +1,14 @@ +# czr_pythons + +Cassandra, ZooKeeper, RabbitMQ and assorted Pythons + +It's [cass_zk_rmq](/cass_zk_rmq) but with extra: +* build-essentials +* git +* Python 2.7 + * cassandra, kazoo and CoolAMQP + * common utility and testing libraries + --- diff --git a/czr_pythons_pg/README.md b/czr_pythons_pg/README.md index bbf99a3..0cb9818 100644 --- a/czr_pythons_pg/README.md +++ b/czr_pythons_pg/README.md @@ -1,4 +1,6 @@ + + --- Usage in Vagrantfile: diff --git a/nodejs4/README.md b/nodejs4/README.md index 44ba445..3242ce6 100644 --- a/nodejs4/README.md +++ b/nodejs4/README.md @@ -1,3 +1,13 @@ +# nodejs4 + +NodeJS 4 + bower + gulp + +* NodeJS 4.x +* bower +* gulp +* git +* build-essential +* curl --- diff --git a/nodejs5_jdk_adk25/README.md b/nodejs5_jdk_adk25/README.md index 8f717a9..af197ef 100644 --- a/nodejs5_jdk_adk25/README.md +++ b/nodejs5_jdk_adk25/README.md @@ -1,3 +1,38 @@ +# nodejs5_jdk_adk25 + +NodeJS 5.x + JDK + ADT + cordova + +* NodeJS 5.12 +* bower +* gulp +* cordova 6.3.1 +* zipalign +* Android toolchain +* build-tools: +* 25.0.1 +* 24.0.0 +* Android platform: +* 25 +* 23 +* 23 +* Platform tools +* Google Play services + +Use like: +``` +config.vm.box = "henrietta/nodejs5_jdk_adk25" +config.vm.box_url = "http://dev.dms-serwis.com.pl/vagrant/nodejs5_jdk_adk25.box" +``` + +This machine requires a lot of CPU and memory. You can use ones below: +``` +config.vm.provider "virtualbox" do |v| +v.memory = 1260 +v.cpus = 3 +end +``` + + --- -- GitLab