diff --git a/cass_zk_rmq/DESCRIPTION b/cass_zk_rmq/DESCRIPTION deleted file mode 100644 index 15e1fd583f6ee5fcb3397d0e9313338eb496463d..0000000000000000000000000000000000000000 --- a/cass_zk_rmq/DESCRIPTION +++ /dev/null @@ -1 +0,0 @@ -Cassandra, ZooKeeper, RabbitMQ \ No newline at end of file diff --git a/cass_zk_rmq/README.md b/cass_zk_rmq/README.md index e1a7693e2730dc22fd0bbc51c433b221082efe25..7ba2cd853ca86e803a64eb6ed3320699cb726e16 100644 --- a/cass_zk_rmq/README.md +++ b/cass_zk_rmq/README.md @@ -1,5 +1,7 @@ # cass_zk_mq +Cassandra, ZooKeeper, RabbitMQ + Added: * curl * Sun Java 8 diff --git a/cassandra/DESCRIPTION b/cassandra/DESCRIPTION deleted file mode 100644 index a218ac4cd0541c439932a0646edb4e7baf050fe8..0000000000000000000000000000000000000000 --- a/cassandra/DESCRIPTION +++ /dev/null @@ -1 +0,0 @@ -Debian Jessie x86_64 with Cassandra 3.0.9 \ No newline at end of file diff --git a/cassandra/README.md b/cassandra/README.md index 1d056c283ee3ea535931df701edc8af4c240e4e9..5beb433fdb65c8dbe554963bd5de322318102d77 100644 --- a/cassandra/README.md +++ b/cassandra/README.md @@ -1,5 +1,6 @@ # cassandra +Debian Jessie x86_64 with Cassandra 3.0.9 Added: * curl diff --git a/czr_pythons/DESCRIPTION b/czr_pythons/DESCRIPTION deleted file mode 100644 index 43b9777685168d330de3d45c60bef21dac81a163..0000000000000000000000000000000000000000 --- a/czr_pythons/DESCRIPTION +++ /dev/null @@ -1 +0,0 @@ -Cassandra, ZooKeeper, RabbitMQ and assorted Pythons \ No newline at end of file diff --git a/czr_pythons/README.md b/czr_pythons/README.md index f97e1729db83d926d1dc97d9287b1ede4e7ee7c7..1ac9085ecd34db11e4235199b38f4f0634989d11 100644 --- a/czr_pythons/README.md +++ b/czr_pythons/README.md @@ -1,5 +1,7 @@ # czr_pythons +Cassandra, ZooKeeper, RabbitMQ and assorted Pythons + It's [cass_zk_rmq](/cass_zk_rmq) but with extra: * build-essentials * git diff --git a/czr_pythons_pg/DESCRIPTION b/czr_pythons_pg/DESCRIPTION deleted file mode 100644 index 63bfdda18ee6c9ad405b6c7d8458b110545cf6f7..0000000000000000000000000000000000000000 --- a/czr_pythons_pg/DESCRIPTION +++ /dev/null @@ -1 +0,0 @@ -czr_pythons but with PostgreSQL \ No newline at end of file diff --git a/czr_pythons_pg/README.md b/czr_pythons_pg/README.md index 7abd432daa8f0aad601bf3d805cc3980fbdbe825..3757c8e408324a8f2f79f7faaca9eb52f264c8f3 100644 --- a/czr_pythons_pg/README.md +++ b/czr_pythons_pg/README.md @@ -1,5 +1,7 @@ # czr_pythons_pg +czr_pythons but with PostgreSQL + It's [cass_zk_rmq](/cass_zk_rmq) but with extra: * build-essentials * git diff --git a/make.py b/make.py index ab7a872d02b369794f340c908e3eeec4ddf01e09..354f04d44386ee83f372c980d94bd2835dabd731 100644 --- a/make.py +++ b/make.py @@ -48,8 +48,8 @@ build_$BOX: # README.md index = [] for box in boxes: - with open(os.path.join(box, 'DESCRIPTION'), 'rb') as mdin: - description = mdin.read().strip() + with open(os.path.join(box, 'README.md'), 'rb') as mdin: + description = mdin.readlines()[2].strip() index.append( u'* **$BOX**: [$DESCRIPTION](/$BOX/README.md)\n'.replace('$DESCRIPTION', description).replace('$BOX', @@ -94,8 +94,8 @@ Boxes, after being built, will be automatically available at if ' '.join(sys.argv).endswith('meta'): box = os.path.split(os.getcwd())[-1] - with open('DESCRIPTION', 'rb') as mdin, open('metadata.json', 'wb') as mdout: - description = mdin.read().strip() + with open('README.md', 'rb') as mdin, open('metadata.json', 'wb') as mdout: + description = mdin.readlines()[2].strip() mdout.write('''{ diff --git a/nodejs4/DESCRIPTION b/nodejs4/DESCRIPTION deleted file mode 100644 index d285119e40c2c52ebd9dbd361f9494d86eda484d..0000000000000000000000000000000000000000 --- a/nodejs4/DESCRIPTION +++ /dev/null @@ -1 +0,0 @@ -NodeJS 4 + bower + gulp \ No newline at end of file diff --git a/nodejs4/README.md b/nodejs4/README.md index 3c26c0766410fdb63aaf164bba257c83fe5ffd16..26ebf570dd8d8ee7251a3abf4e3b8a3cfea466c3 100644 --- a/nodejs4/README.md +++ b/nodejs4/README.md @@ -1,5 +1,7 @@ # nodejs4 +NodeJS 4 + bower + gulp + * NodeJS 4.x * bower * gulp diff --git a/nodejs5_jdk_adk25/DESCRIPTION b/nodejs5_jdk_adk25/DESCRIPTION deleted file mode 100644 index f62f671bc0e0d1567b2a334e1dd0a1946c4fd318..0000000000000000000000000000000000000000 --- a/nodejs5_jdk_adk25/DESCRIPTION +++ /dev/null @@ -1 +0,0 @@ -odeJS 5.x + JDK + ADT + cordova \ No newline at end of file diff --git a/nodejs5_jdk_adk25/README.md b/nodejs5_jdk_adk25/README.md index a6e908fbbaec0e3b005438d70c37f37d4e8d3a64..2bf9eff2f342228c077bb072a9bef52b0593b9dc 100644 --- a/nodejs5_jdk_adk25/README.md +++ b/nodejs5_jdk_adk25/README.md @@ -1,5 +1,7 @@ # nodejs5_jdk_adk25 +odeJS 5.x + JDK + ADT + cordova + * NodeJS 5.12 * bower * gulp diff --git a/run.sh b/run.sh index e21421d628346225205b1165bf816b01c38b2b04..9b2bc6d9ce0723c037c397908741b62c1c0510e5 100644 --- a/run.sh +++ b/run.sh @@ -2,7 +2,7 @@ shutdown -h +30 "Timeout on VM creation" -if [ ! -f "/vagrant/build.sh" ]; then +if [ ! -e "/vagrant/build.sh" ]; then sudo -H -u vagrant bash /vagrant/build_as_vagrant.sh else bash /vagrant/build.sh