Skip to content
This repository
Browse code

Update bundler to 1.2.1

- Change the order of arguments in bundle commands to make them work
  with new bundler

stager bump shortlog e39a094..4b33245

David Sabeti (1):
  Clear out tmpdir at start-up

Dr Nic Williams (1):
  Support generic env without -u flags to unset vars

Jennifer Hickey (1):
  Bump vcap-staging

Jennifer Hickey and Matthew Kocher (1):
  Rename common to staging_plugin

Maria Shaldybina (1):
  Bump vcap-staging

Matthew Kocher (1):
  Include hidden files at root level in droplet

Change-Id: Ie0386a1bbc241a5e8d3890568da55c93e2c23af6
  • Loading branch information...
commit 2e1eca02991f511e14729602be64dfd2b7572e30 1 parent 5a0d2f6
Maria Shaldibina mariash authored

Showing 30 changed files with 37 additions and 41 deletions. Show diff stats Hide diff stats

  1. +4 8 config/blobs.yml
  2. +1 1  packages/collector/packaging
  3. +1 1  packages/dashboard/packaging
  4. +1 1  packages/dea/packaging
  5. +1 1  packages/dea_next/packaging
  6. +1 1  packages/dea_ruby18/packaging
  7. +1 1  packages/dea_ruby18/spec
  8. +1 1  packages/dea_ruby19/packaging
  9. +1 1  packages/dea_ruby19/spec
  10. +1 1  packages/login/packaging
  11. +1 1  packages/memcached_node_ng/packaging
  12. +1 1  packages/mongodb_node_ng/packaging
  13. +1 1  packages/mysql_node/packaging
  14. +2 2 packages/mysql_node_ng/packaging
  15. +1 1  packages/nats/packaging
  16. +1 1  packages/postgresql_node/packaging
  17. +2 2 packages/postgresql_node_ng/packaging
  18. +1 1  packages/rabbit_node/packaging
  19. +2 2 packages/rabbit_node_ng/packaging
  20. +1 1  packages/redis_node/packaging
  21. +2 2 packages/redis_node_ng/packaging
  22. +1 1  packages/router/packaging
  23. +1 1  packages/ruby/packaging
  24. +1 1  packages/ruby/spec
  25. +1 1  packages/ruby_next/packaging
  26. +1 1  packages/ruby_next/spec
  27. +1 1  packages/uaa/packaging
  28. +1 1  packages/vblob_node_ng/packaging
  29. +1 1  packages/warden/packaging
  30. +1 1  src/stager
12 config/blobs.yml
@@ -107,10 +107,6 @@ ruby/ruby-1.9.2-p180.tar.gz:
107 107 object_id: eyJvaWQiOiI0ZTRlNzhiY2EyMWUxMjEwMDRlNGU3ZDUxMWY1NTMwNGYzMDY5%0AMGM4OGZkOSIsInNpZyI6IkE1VlllWVduMVpadFNHbGRpeGM1STgzTU9Jaz0i%0AfQ==%0A
108 108 sha: 6a482bc07239b37bcadf68dda63c65d20dc19ebe
109 109 size: 11158935
110   -ruby/bundler-1.0.12.gem:
111   - object_id: eyJvaWQiOiI0ZTRlNzhiY2E2MWUxMjIwMDRlNGU4ZWM2YjQ0YjYwNGYzMDY5%0AMTcxNjY1MSIsInNpZyI6IkRLQnNDUFpZTEg1VHVkZTNPRlREMzFFa1NkRT0i%0AfQ==%0A
112   - sha: 4acd470b77d0d8f66440f137c918464b3e967a42
113   - size: 160768
114 110 ruby/rake-0.8.7.gem:
115 111 object_id: eyJvaWQiOiI0ZTRlNzhiY2E1MWUxMjEwMDRlNGU3ZDUxOTA2Y2QwNGYzMDY5%0AMWM0NWFlMCIsInNpZyI6Img0aWh0QVo0cGNrWWxsYXRpZUhTU251TzArUT0i%0AfQ==%0A
116 112 sha: 91daad079d404b68a7dd179716b9fdd0c195144c
@@ -519,10 +515,6 @@ ruby/rubygems-1.8.24.tgz:
519 515 object_id: eyJzaWciOiJkZkdFQ2k0aXFua1pESmZvalNKa09tSGtySkU9Iiwib2lkIjoi%0ANGU0ZTc4YmNhNDFlMTIyMjA0ZTRlOTg2M2QwNzYzMDRmYTFjYzI4Nzk3YTki%0AfQ==%0A
520 516 sha: 30f27047e74f7943117736a0d3e224994fee0905
521 517 size: 380101
522   -ruby/bundler-1.1.3.gem:
523   - object_id: eyJzaWciOiJuSFZEcUUvU0lrWHpCOGVJZUxhSjZjZHJVTGM9Iiwib2lkIjoi%0ANGU0ZTc4YmNhNjFlMTIyMDA0ZTRlOGVjNmI0NGI2MDRmYTFjYzI2NGFiMjUi%0AfQ==%0A
524   - sha: 64e3aa4457e3d921d766e88b65265ff8b941b306
525   - size: 204288
526 518 imagemagick/freetype-2.4.10.tar.gz:
527 519 object_id: eyJvaWQiOiI0ZTRlNzhiY2EzMWUxMjIyMDRlNGU5ODYzYjFiNzQwNGZlOGVh%0AYTkxYjU2MCIsInNpZyI6Iks1TVlZa3NBa0hEQ2U1ckY5ZlpMSjZsWVhkOD0i%0AfQ==%0A
528 520 sha: 44dba26ff965b1cd1c62e480fdefaeca62ed33da
@@ -691,3 +683,7 @@ uaa/cloudfoundry-identity-batch-1.0.2.war:
691 683 object_id: eyJvaWQiOiI0ZTRlNzhiY2E1MWUxMjEwMDRlNGU3ZDUxOTA2Y2QwNTBhZmI4%0AMjdlMGFhZiIsInNpZyI6ImhYVjlIK0tnWG41Yklkdk5TMCtXOXl5ZU56Zz0i%0AfQ==%0A
692 684 sha: b716a10b3258a5c459625d2fb6cc0d673a834c98
693 685 size: 24049061
  686 +ruby/bundler-1.2.1.gem:
  687 + object_id: eyJvaWQiOiI0ZTRlNzhiY2EzMWUxMjEyMDRlNGU4NmVlMzk2OTIwNTBhMTYy%0ANTJmMDUyZiIsInNpZyI6InZYOFl0dktMN3k5NWNHWTZnbnpVcFpHY2tUMD0i%0AfQ==%0A
  688 + sha: 0cbe6ad7a41f064d6c11c1058465fffb1bd58069
  689 + size: 226816
2  packages/collector/packaging
@@ -5,4 +5,4 @@ cp -a tools/collector/* ${BOSH_INSTALL_TARGET}
5 5
6 6 cd ${BOSH_INSTALL_TARGET}
7 7
8   -/var/vcap/packages/ruby/bin/bundle --local install --deployment --without=development test
  8 +/var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
2  packages/dashboard/packaging
@@ -14,4 +14,4 @@ cp -a ${BOSH_COMPILE_TARGET}/dashboard/dashboard-1.0-SNAPSHOT-d7c8acf9.war webap
14 14 cd ${BOSH_INSTALL_TARGET}
15 15 cp -a ${BOSH_COMPILE_TARGET}/tools/router_registrar router_registrar
16 16 cd router_registrar
17   -/var/vcap/packages/ruby/bin/bundle --local install --deployment --without=development test
  17 +/var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
2  packages/dea/packaging
@@ -5,5 +5,5 @@ cp -a dea/* ${BOSH_INSTALL_TARGET}
5 5
6 6 (
7 7 cd ${BOSH_INSTALL_TARGET}
8   - /var/vcap/packages/ruby/bin/bundle --local install --deployment --without=development test
  8 + /var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
9 9 )
2  packages/dea_next/packaging
@@ -5,7 +5,7 @@ cp -a dea_next/* ${BOSH_INSTALL_TARGET}
5 5
6 6 (
7 7 cd ${BOSH_INSTALL_TARGET}
8   - /var/vcap/packages/ruby/bin/bundle --local install --deployment --without=development test
  8 + /var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
9 9
10 10 GOLANG_PATH=`readlink -nf /var/vcap/packages/golang`
11 11 PATH=$GOLANG_PATH/bin:$PATH
2  packages/dea_ruby18/packaging
@@ -20,7 +20,7 @@ tar zxvf ruby/rubygems-1.8.24.tgz
20 20 )
21 21
22 22 echo "Building bundler"
23   -${BOSH_INSTALL_TARGET}/bin/gem install ruby/bundler-1.1.3.gem --no-ri --no-rdoc
  23 +${BOSH_INSTALL_TARGET}/bin/gem install ruby/bundler-1.2.1.gem --no-ri --no-rdoc
24 24
25 25 echo "Building rake"
26 26 ${BOSH_INSTALL_TARGET}/bin/gem install ruby/rake-0.8.7.gem --no-ri --no-rdoc
2  packages/dea_ruby18/spec
@@ -3,5 +3,5 @@ name: dea_ruby18
3 3 files:
4 4 - ruby/ruby-1.8.7-p357.tar.bz2
5 5 - ruby/rubygems-1.8.24.tgz
6   -- ruby/bundler-1.1.3.gem
  6 +- ruby/bundler-1.2.1.gem
7 7 - ruby/rake-0.8.7.gem
2  packages/dea_ruby19/packaging
@@ -18,4 +18,4 @@ tar zxvf ruby/rubygems-1.8.24.tgz
18 18 )
19 19
20 20 echo "Building bundler"
21   -${BOSH_INSTALL_TARGET}/bin/gem install ruby/bundler-1.1.3.gem --no-ri --no-rdoc
  21 +${BOSH_INSTALL_TARGET}/bin/gem install ruby/bundler-1.2.1.gem --no-ri --no-rdoc
2  packages/dea_ruby19/spec
@@ -3,4 +3,4 @@ name: dea_ruby19
3 3 files:
4 4 - ruby/ruby-1.9.2-p180.tar.gz
5 5 - ruby/rubygems-1.8.24.tgz
6   -- ruby/bundler-1.1.3.gem
  6 +- ruby/bundler-1.2.1.gem
2  packages/login/packaging
@@ -29,4 +29,4 @@ cp -a ${BOSH_COMPILE_TARGET}/uaa/cloudfoundry-identity-varz-1.0.2.war webapps/va
29 29 cd ${BOSH_INSTALL_TARGET}
30 30 cp -a ${BOSH_COMPILE_TARGET}/tools/vcap_registrar vcap_registrar
31 31 cd vcap_registrar
32   -/var/vcap/packages/ruby/bin/bundle --local install --deployment --without=development test
  32 +/var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
2  packages/memcached_node_ng/packaging
@@ -12,7 +12,7 @@ cp -a * ${BOSH_INSTALL_TARGET}
12 12 $bundle_cmd install --local --deployment --without=development test
13 13
14 14 cd ${BOSH_INSTALL_TARGET}/warden
15   - $bundle_cmd --local install --deployment --without=development test
  15 + $bundle_cmd install --local --deployment --without=development test
16 16
17 17 # Configure it to our liking, as well as compile helper binaries
18 18 $bundle_cmd exec rake setup:bin
2  packages/mongodb_node_ng/packaging
@@ -12,7 +12,7 @@ cp -a * ${BOSH_INSTALL_TARGET}
12 12 $bundle_cmd install --local --deployment
13 13
14 14 cd ${BOSH_INSTALL_TARGET}/warden
15   - $bundle_cmd --local install --deployment --without=development test
  15 + $bundle_cmd install --local --deployment --without=development test
16 16
17 17 # Configure it to our liking, as well as compile helper binaries
18 18 $bundle_cmd exec rake setup:bin
2  packages/mysql_node/packaging
@@ -7,5 +7,5 @@ cp -a * ${BOSH_INSTALL_TARGET}
7 7 cd ${BOSH_INSTALL_TARGET}/services/mysql
8 8 /var/vcap/packages/ruby/bin/bundle config build.do_sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite
9 9 /var/vcap/packages/ruby/bin/bundle config build.mysql2 --with-mysql-dir=/var/vcap/packages/mysqlclient --with-mysql-include=/var/vcap/packages/mysqlclient/include/mysql
10   - /var/vcap/packages/ruby/bin/bundle --local install --deployment
  10 + /var/vcap/packages/ruby/bin/bundle install --local --deployment
11 11 )
4 packages/mysql_node_ng/packaging
@@ -7,10 +7,10 @@ cp -a * ${BOSH_INSTALL_TARGET}
7 7 cd ${BOSH_INSTALL_TARGET}/services/ng/mysql
8 8 /var/vcap/packages/ruby/bin/bundle config build.do_sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite
9 9 /var/vcap/packages/ruby/bin/bundle config build.mysql2 --with-mysql-dir=/var/vcap/packages/mysqlclient --with-mysql-include=/var/vcap/packages/mysqlclient/include/mysql
10   - /var/vcap/packages/ruby/bin/bundle --local install --deployment
  10 + /var/vcap/packages/ruby/bin/bundle install --local --deployment
11 11
12 12 cd ${BOSH_INSTALL_TARGET}/warden
13   - /var/vcap/packages/ruby/bin/bundle --local install --deployment --without=development test
  13 + /var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
14 14
15 15 # Configure it to our liking, as well as compile helper binaries
16 16 /var/vcap/packages/ruby/bin/bundle exec rake setup:bin
2  packages/nats/packaging
@@ -4,5 +4,5 @@ set -e
4 4 cp -a nats/* ${BOSH_INSTALL_TARGET}
5 5 (
6 6 cd ${BOSH_INSTALL_TARGET}
7   - /var/vcap/packages/ruby/bin/bundle --binstubs --local install --deployment
  7 + /var/vcap/packages/ruby/bin/bundle install --binstubs --local --deployment
8 8 )
2  packages/postgresql_node/packaging
@@ -8,5 +8,5 @@ rm ${BOSH_INSTALL_TARGET}/packaging
8 8 cd ${BOSH_INSTALL_TARGET}/services/postgresql
9 9 /var/vcap/packages/ruby/bin/bundle config build.do_sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite
10 10 /var/vcap/packages/ruby/bin/bundle config build.pg --with-pg-dir=/var/vcap/packages/postgresql
11   - /var/vcap/packages/ruby/bin/bundle --local install --deployment
  11 + /var/vcap/packages/ruby/bin/bundle install --local --deployment
12 12 )
4 packages/postgresql_node_ng/packaging
@@ -8,10 +8,10 @@ rm ${BOSH_INSTALL_TARGET}/packaging
8 8 cd ${BOSH_INSTALL_TARGET}/services/ng/postgresql
9 9 /var/vcap/packages/ruby/bin/bundle config build.do_sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite
10 10 /var/vcap/packages/ruby/bin/bundle config build.pg --with-pg-dir=/var/vcap/packages/postgresql
11   - /var/vcap/packages/ruby/bin/bundle --local install --deployment
  11 + /var/vcap/packages/ruby/bin/bundle install --local --deployment
12 12
13 13 cd ${BOSH_INSTALL_TARGET}/warden
14   - /var/vcap/packages/ruby/bin/bundle --local install --deployment --without=development test
  14 + /var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
15 15
16 16 # Configure it to our liking, as well as compile helper binaries
17 17 /var/vcap/packages/ruby/bin/bundle exec rake setup:bin
2  packages/rabbit_node/packaging
@@ -6,5 +6,5 @@ cp -a * ${BOSH_INSTALL_TARGET}
6 6 (
7 7 cd ${BOSH_INSTALL_TARGET}/services/rabbit
8 8 /var/vcap/packages/ruby/bin/bundle config build.do_sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite
9   - /var/vcap/packages/ruby/bin/bundle --local install --deployment
  9 + /var/vcap/packages/ruby/bin/bundle install --local --deployment
10 10 )
4 packages/rabbit_node_ng/packaging
@@ -7,10 +7,10 @@ cp -a * ${BOSH_INSTALL_TARGET}
7 7 cd ${BOSH_INSTALL_TARGET}/services/ng/rabbit
8 8 bundle_cmd=/var/vcap/packages/ruby/bin/bundle
9 9 $bundle_cmd config build.do_sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite
10   - $bundle_cmd --local install --deployment
  10 + $bundle_cmd install --local --deployment
11 11
12 12 cd ${BOSH_INSTALL_TARGET}/warden
13   - $bundle_cmd --local install --deployment --without=development test
  13 + $bundle_cmd install --local --deployment --without=development test
14 14
15 15 # Configure it to our liking, as well as compile helper binaries
16 16 $bundle_cmd exec rake setup:bin
2  packages/redis_node/packaging
@@ -6,5 +6,5 @@ cp -a * ${BOSH_INSTALL_TARGET}
6 6 (
7 7 cd ${BOSH_INSTALL_TARGET}/services/redis
8 8 /var/vcap/packages/ruby/bin/bundle config build.do_sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite
9   - /var/vcap/packages/ruby/bin/bundle --local install --deployment
  9 + /var/vcap/packages/ruby/bin/bundle install --local --deployment
10 10 )
4 packages/redis_node_ng/packaging
@@ -7,10 +7,10 @@ cp -a * ${BOSH_INSTALL_TARGET}
7 7 cd ${BOSH_INSTALL_TARGET}/services/ng/redis
8 8 bundle_cmd=/var/vcap/packages/ruby/bin/bundle
9 9 $bundle_cmd config build.do_sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite
10   - $bundle_cmd --local install --deployment
  10 + $bundle_cmd install --local --deployment
11 11
12 12 cd ${BOSH_INSTALL_TARGET}/warden
13   - $bundle_cmd --local install --deployment --without=development test
  13 + $bundle_cmd install --local --deployment --without=development test
14 14
15 15 # Configure it to our liking, as well as compile helper binaries
16 16 $bundle_cmd exec rake setup:bin
2  packages/router/packaging
@@ -5,5 +5,5 @@ cp -a router/* ${BOSH_INSTALL_TARGET}
5 5
6 6 (
7 7 cd ${BOSH_INSTALL_TARGET}
8   - /var/vcap/packages/ruby/bin/bundle --local install --deployment
  8 + /var/vcap/packages/ruby/bin/bundle install --local --deployment
9 9 )
2  packages/ruby/packaging
@@ -17,4 +17,4 @@ tar zxvf ruby/rubygems-1.8.24.tgz
17 17 ${BOSH_INSTALL_TARGET}/bin/ruby setup.rb
18 18 )
19 19
20   -${BOSH_INSTALL_TARGET}/bin/gem install ruby/bundler-1.1.3.gem --no-ri --no-rdoc
  20 +${BOSH_INSTALL_TARGET}/bin/gem install ruby/bundler-1.2.1.gem --no-ri --no-rdoc
2  packages/ruby/spec
@@ -3,4 +3,4 @@ name: ruby
3 3 files:
4 4 - ruby/ruby-1.9.2-p180.tar.gz
5 5 - ruby/rubygems-1.8.24.tgz
6   -- ruby/bundler-1.1.3.gem
  6 +- ruby/bundler-1.2.1.gem
2  packages/ruby_next/packaging
@@ -17,4 +17,4 @@ tar zxvf ruby/rubygems-1.8.24.tgz
17 17 ${BOSH_INSTALL_TARGET}/bin/ruby setup.rb
18 18 )
19 19
20   -${BOSH_INSTALL_TARGET}/bin/gem install ruby/bundler-1.1.3.gem --no-ri --no-rdoc
  20 +${BOSH_INSTALL_TARGET}/bin/gem install ruby/bundler-1.2.1.gem --no-ri --no-rdoc
2  packages/ruby_next/spec
@@ -3,4 +3,4 @@ name: ruby_next
3 3 files:
4 4 - ruby/ruby-1.9.3-p194.tar.gz
5 5 - ruby/rubygems-1.8.24.tgz
6   -- ruby/bundler-1.1.3.gem
  6 +- ruby/bundler-1.2.1.gem
2  packages/uaa/packaging
@@ -30,4 +30,4 @@ cp -a ${BOSH_COMPILE_TARGET}/uaa/cloudfoundry-identity-varz-1.0.2.war webapps/va
30 30 cd ${BOSH_INSTALL_TARGET}
31 31 cp -a ${BOSH_COMPILE_TARGET}/tools/vcap_registrar vcap_registrar
32 32 cd vcap_registrar
33   -/var/vcap/packages/ruby/bin/bundle --local install --deployment --without=development test
  33 +/var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
2  packages/vblob_node_ng/packaging
@@ -10,7 +10,7 @@ cp -a * ${BOSH_INSTALL_TARGET}
10 10 $bundle_cmd install --local --deployment --without=development test
11 11
12 12 cd ${BOSH_INSTALL_TARGET}/warden
13   - $bundle_cmd --local install --deployment --without=development test
  13 + $bundle_cmd install --local --deployment --without=development test
14 14
15 15 # Configure it to our liking, as well as compile helper binaries
16 16 $bundle_cmd exec rake setup:bin
2  packages/warden/packaging
@@ -10,7 +10,7 @@ cp -a * ${BOSH_INSTALL_TARGET}
10 10
11 11 cd ${BOSH_INSTALL_TARGET}/warden
12 12
13   - bundle --local install --deployment --without=development test
  13 + bundle install --local --deployment --without=development test
14 14
15 15 # Compile binaries
16 16 bundle exec rake setup:bin
2  src/stager
... ... @@ -1 +1 @@
1   -Subproject commit e39a0943b54ae2cc8527c7de5ed764a486176c17
  1 +Subproject commit 4b33245ca96d2ef2a8ed7bfd559d1d7ec55d2ca4

Git Notes

review

Code-Review+2: Patrick Bozeman <pbozeman@vmware.com>
Verified+1: CI Master <cf-ci@rbcon.com>
Code-Review+2: Ryan Tang <ryantang@rbcon.com>
Submitted-by: Maria Shaldybina <mariash@vmware.com>
Submitted-at: Fri, 04 Jan 2013 20:18:57 +0000
Reviewed-on: http://reviews.cloudfoundry.org/11358
Project: cf-release
Branch: refs/heads/master

0 comments on commit 2e1eca0

Please sign in to comment.
Something went wrong with that request. Please try again.