Merge pull request #16 from cloudfoundry-community/update-version

Updated admin ui version and cut v5 release

.final_builds/packages/admin_ui/index.yml

@@ -1,25 +1,23 @@
 ---
 builds:
-  !binary "OGJlODYwZmQxMTU3YjIzZGQzNTJlZTVlZjFkZTdlODJlMGIzODMyZQ==":
+  8be860fd1157b23dd352ee5ef1de7e82e0b3832e:
     blobstore_id: c078345b-bb65-4ed2-820b-7fc50422a5ed
     version: 1
-    sha1: !binary |-
-      NDIyYjU0MGJjZDMxMDNkYmJkZWVkMGRlMjA3OTEyNmNkYzdhY2FlZg==
-  !binary "YzdlNjg0YWFkNGRjZjdkMDBhYmViNTkxZjkyYWY3NjZhNzdlOTRjZA==":
+    sha1: 422b540bcd3103dbbdeed0de2079126cdc7acaef
+  c7e684aad4dcf7d00abeb591f92af766a77e94cd:
     blobstore_id: 3b2503d6-72a2-4189-ad5f-78fbdad56c4e
     version: 2
-    sha1: !binary |-
-      NmJlMmNhODQ1ODdmMjE2ODcwOWQ2NzE4YjMxNmM0YmQ3Y2NjNTRiMw==
-  !binary "OWRlZmY5YTg4M2FiOWYyYTMyZGYwMDYzZWQ3N2ZhNjVkMTdjOTZlZQ==":
+    sha1: 6be2ca84587f2168709d6718b316c4bd7ccc54b3
+  9deff9a883ab9f2a32df0063ed77fa65d17c96ee:
     blobstore_id: 79266387-2d97-45d1-a170-fe2cf10a0981
-    version: !binary |-
-      OWRlZmY5YTg4M2FiOWYyYTMyZGYwMDYzZWQ3N2ZhNjVkMTdjOTZlZQ==
-    sha1: !binary |-
-      ZWU1MjM0NGQzOTMyNDJiM2IxNDEyNDVlYTNjMDRhYTk1YmQ4MjE2ZA==
-  !binary "ZDhkNWFkY2QyMmI3OGI5ZWMxNzYzNzQxNGU0OGIzNzJhOTEwNDIwYQ==":
-    version: !binary |-
-      ZDhkNWFkY2QyMmI3OGI5ZWMxNzYzNzQxNGU0OGIzNzJhOTEwNDIwYQ==
-    sha1: !binary |-
-      OGU2MGYzYTBhODMxNzg2MWZiZDMyOGI3OWU0ODI0YzE3ZTE1NWFlMA==
+    version: 9deff9a883ab9f2a32df0063ed77fa65d17c96ee
+    sha1: ee52344d393242b3b141245ea3c04aa95bd8216d
+  d8d5adcd22b78b9ec17637414e48b372a910420a:
+    version: d8d5adcd22b78b9ec17637414e48b372a910420a
+    sha1: 8e60f3a0a8317861fbd328b79e4824c17e155ae0
     blobstore_id: 69a3a976-cbcb-4882-bc50-d9ecfa9a165e
+  f2cf62d93b6c3e2a056852414b214ff2aa7d8b17:
+    version: f2cf62d93b6c3e2a056852414b214ff2aa7d8b17
+    sha1: 7f2bf49276baf3674c29237a020dd16aaf1fdb2c
+    blobstore_id: df1fdb83-2bd3-428b-bc57-3593c279e967
 format-version: '2'

.final_builds/packages/mysqlclient/index.yml

@@ -0,0 +1,7 @@
+---
+builds:
+  8b5d9ce287341048377997a9b3fe4ff3e6a1c68f:
+    version: 8b5d9ce287341048377997a9b3fe4ff3e6a1c68f
+    sha1: 2428c5f0fe3ea341be7387b6770a0683b7b450bb
+    blobstore_id: 37d83e86-43f0-419b-955e-7032a863c99b
+format-version: '2'

config/blobs.yml

@@ -1,31 +1,29 @@
 ---
 libyaml/yaml-0.1.4.tgz:
   object_id: 720a650d-0b1c-4918-92de-7be57b679fe7
-  sha: !binary |-
-    ZTBlNWUwOTE5MmFiMTBhNjA3ZTNkYTI5NzBkYjQ5MjExOGY1NjBmMg==
+  sha: e0e5e09192ab10a607e3da2970db492118f560f2
   size: 471759
 ruby/bundler-1.2.1.gem:
   object_id: 458d4d9f-aa0e-488d-94d9-ca8b50d6dfb3
-  sha: !binary |-
-    MGNiZTZhZDdhNDFmMDY0ZDZjMTFjMTA1ODQ2NWZmZmIxYmQ1ODA2OQ==
+  sha: 0cbe6ad7a41f064d6c11c1058465fffb1bd58069
   size: 226816
 ruby/ruby-1.9.3-p448.tar.gz:
   object_id: 3fe8a983-f754-44c4-8694-0fba414eb5a7
-  sha: !binary |-
-    YzdmNzM2ZTNiYzFjYTFlNjYxOWE5MTIxODM3ZGQwODQwYWFkNzdjZQ==
+  sha: c7f736e3bc1ca1e6619a9121837dd0840aad77ce
   size: 12559260
 ruby/rubygems-1.8.24.tgz:
   object_id: 824b70e4-8269-4e4b-a347-de17333f7971
-  sha: !binary |-
-    MzBmMjcwNDdlNzRmNzk0MzExNzczNmEwZDNlMjI0OTk0ZmVlMDkwNQ==
+  sha: 30f27047e74f7943117736a0d3e224994fee0905
   size: 380101
 postgres/postgresql-9.0.3.tar.gz:
   object_id: 4c28f40f-3d59-4015-9765-bead803093ad
-  sha: !binary |-
-    YzhmYjVkMWQ3OTMwZTc4MjExZTU1NGJiNTc1MTE4M2E4MTQ4ZDBlZQ==
+  sha: c8fb5d1d7930e78211e554bb5751183a8148d0ee
   size: 18335858
 sqlite/sqlite-autoconf-3070500.tar.gz:
   object_id: f603856f-11db-4b56-91dc-5c6f3ce6fedd
-  sha: !binary |-
-    NGUxMzM4NDk3YjhkYTUwYjg0MzA3MTkxYmIzNDE4ZTllYzU3MTVkNw==
+  sha: 4e1338497b8da50b84307191bb3418e9ec5715d7
   size: 1551070
+mysql/client-5.1.62-rel13.3-435-Linux-x86_64.tar.gz:
+  object_id: 6adad680-4e5d-4e0b-b419-09a951455928
+  sha: 6e5a17195831688a5f14f20aa5d9cd5d5f4164db
+  size: 4105211

packages/admin_ui/packaging

@@ -2,11 +2,13 @@
 set -e -x
 
 bundle_cmd=/var/vcap/packages/ruby/bin/bundle
+mysqlclient_dir=/var/vcap/packages/mysqlclient
 libpq_dir=/var/vcap/packages/libpq
 
 cp -a ${BOSH_COMPILE_TARGET}/{admin_ui,vcap-common} ${BOSH_INSTALL_TARGET}
 
 cd ${BOSH_INSTALL_TARGET}/admin_ui
+$bundle_cmd config build.mysql2 --with-mysql-dir=$mysqlclient_dir --with-mysql-include=$mysqlclient_dir/include/mysql
 $bundle_cmd config build.pg --with-pg-lib=$libpq_dir/lib --with-pg-include=$libpq_dir/include
 $bundle_cmd config build.sequel_pg --with-pg-lib=$libpq_dir/lib --with-pg-include=$libpq_dir/include
 $bundle_cmd config build.sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite

packages/admin_ui/spec

@@ -5,6 +5,7 @@ dependencies:
   - ruby
   - libpq
   - sqlite
+  - mysqlclient
 
 files:
   - admin_ui/{Gemfile,Gemfile.lock}

packages/mysqlclient/packaging

@@ -0,0 +1,10 @@
+set -e -x
+
+VERSION=5.1.62-rel13.3-435-Linux-x86_64
+# Percona binary Linux build - minor change
+tar zxvf mysql/client-$VERSION.tar.gz
+
+cd client-$VERSION
+for x in bin include lib; do
+  cp -a ${x} ${BOSH_INSTALL_TARGET}
+done

packages/mysqlclient/spec

@@ -0,0 +1,4 @@
+---
+name: mysqlclient
+files:
+- mysql/client-5.1.62-rel13.3-435-Linux-x86_64.tar.gz

releases/admin-ui-5.yml

@@ -0,0 +1,65 @@
+---
+packages:
+- name: admin_ui
+  version: f2cf62d93b6c3e2a056852414b214ff2aa7d8b17
+  sha1: 7f2bf49276baf3674c29237a020dd16aaf1fdb2c
+  fingerprint: f2cf62d93b6c3e2a056852414b214ff2aa7d8b17
+  dependencies:
+  - ruby
+  - libpq
+  - sqlite
+  - mysqlclient
+- name: common
+  version: 4987d674c748c83aa0bc2d4965e73659e87920c7
+  sha1: 890c7c9465e35b7ca39d127c54238a2027d4ec4a
+  fingerprint: 4987d674c748c83aa0bc2d4965e73659e87920c7
+  dependencies: []
+- name: libpq
+  version: 826bdeb17b087a4950c232f1830f15b1ad793daa
+  sha1: b8a56efd3400a025b0c49d9fd5252d997ea15240
+  fingerprint: 826bdeb17b087a4950c232f1830f15b1ad793daa
+  dependencies: []
+- name: libyaml
+  version: 681bb455c35ef17cabbd41344f924cb61c2bb8e7
+  sha1: a8ae1088bc79d446ae1f0616371e4e32cf345d0f
+  fingerprint: 681bb455c35ef17cabbd41344f924cb61c2bb8e7
+  dependencies: []
+- name: mysqlclient
+  version: 8b5d9ce287341048377997a9b3fe4ff3e6a1c68f
+  sha1: 2428c5f0fe3ea341be7387b6770a0683b7b450bb
+  fingerprint: 8b5d9ce287341048377997a9b3fe4ff3e6a1c68f
+  dependencies: []
+- name: ruby
+  version: c146cbd35dd2f549b0f90c7f40d5a0e5cb3698c4
+  sha1: 2dae18aea1b550bec7ccd6cc0e9ee889876eeb81
+  fingerprint: c146cbd35dd2f549b0f90c7f40d5a0e5cb3698c4
+  dependencies:
+  - libyaml
+- name: sqlite
+  version: af44d44e58fffd069459cb63f6fcc37c6326e370
+  sha1: 43c7c2e86d69bf37fb8358af680d933bd734dafd
+  fingerprint: af44d44e58fffd069459cb63f6fcc37c6326e370
+  dependencies: []
+- name: uaac
+  version: 73b451bc38c388f720f85977d47f1d7e996c0776
+  sha1: 78c7ac9ae354670bf5751abc1ee84b2a59dba583
+  fingerprint: 73b451bc38c388f720f85977d47f1d7e996c0776
+  dependencies:
+  - ruby
+jobs:
+- name: admin_ui
+  version: f8b1a9f7f77fa1ea1ed87530987ec757dd52e754
+  fingerprint: f8b1a9f7f77fa1ea1ed87530987ec757dd52e754
+  sha1: b6188dd8a4cb7132d58407db89cfcdc040193823
+- name: deregister_admin_ui
+  version: 78f493bfb0c56365216dfaf44d3c242bc5161ced
+  fingerprint: 78f493bfb0c56365216dfaf44d3c242bc5161ced
+  sha1: 3717fdf57b366f2ec07b4ebeba88fa452c8288af
+- name: register_admin_ui
+  version: 69aab58a8911f9d8804ad009c7f5d14ebc9af4f1
+  fingerprint: 69aab58a8911f9d8804ad009c7f5d14ebc9af4f1
+  sha1: 67e094ebc653fb83708b7ef1a555bc7ca962b3e7
+commit_hash: 4c302581
+uncommitted_changes: true
+name: admin-ui
+version: '5'

releases/index.yml

@@ -1,11 +1,13 @@
 ---
 builds:
-  !binary "NTFjYjdkYjU3ZjYyYTNjZDlkYmMyOGZkNGJiMDQ3YjE5NDI5YmE4MA==":
+  51cb7db57f62a3cd9dbc28fd4bb047b19429ba80:
     version: 1
-  !binary "YzViZGI0MmViZGE0MTAxNzM4MTI5YTBjZjA0OWJiZGQxMTRmZDgxYg==":
+  c5bdb42ebda4101738129a0cf049bbdd114fd81b:
     version: 2
-  !binary "NjAzN2QwYTNhZTUxMDE3MzIyZmQ0Y2UwNmY0NWI4NzJlNjc4MDBkMA==":
+  6037d0a3ae51017322fd4ce06f45b872e67800d0:
     version: '3'
   2ef09b92-bbb0-4376-8649-1c56d2d87259:
     version: '4'
+  5f526be2-e900-43b8-85cd-436af943aa58:
+    version: '5'
 format-version: '2'