Merge pull request #634 from marineam/gce2

Small GCE updates

sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/files/0001-feat-accounts-add-users-to-the-sudo-and-docker-group.patch

@@ -1,16 +1,18 @@
-From 6126db1c7c690d666b2389c4a918a4c4955c8e91 Mon Sep 17 00:00:00 2001
+From dbe7826e27c8f82afbd7acf902812f4d9c8317d6 Mon Sep 17 00:00:00 2001
 From: Brandon Philips <brandon@ifup.co>
 Date: Fri, 4 Apr 2014 12:12:00 -0700
-Subject: [PATCH] feat(accounts): add users to the sudo group by default
+Subject: [PATCH] feat(accounts): add users to the sudo and docker groups by
+ default
 
 On CoreOS the sudo group gets passwordless sudo. Add users to this
-group.
+group. Docker is used to provide access to gcloud tools, give users
+access so docker just works for them.
 ---
  google-daemon/usr/share/google/google_daemon/accounts.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/google-daemon/usr/share/google/google_daemon/accounts.py b/google-daemon/usr/share/google/google_daemon/accounts.py
-index 6f970c4..17cb2ce 100755
+index 4c572ca..ae00e1b 100755
 --- a/google-daemon/usr/share/google/google_daemon/accounts.py
 +++ b/google-daemon/usr/share/google/google_daemon/accounts.py
 @@ -76,7 +76,7 @@ class Accounts(object):
@@ -18,10 +20,10 @@ index 6f970c4..17cb2ce 100755
  
      self.default_user_groups = self.GroupsThatExist(
 -        ['adm', 'video', 'dip', 'plugdev'])
-+        ['adm', 'video', 'dip', 'plugdev', 'sudo'])
++        ['adm', 'video', 'dip', 'plugdev', 'sudo', 'docker'])
  
    def CreateUser(self, username, ssh_keys):
      """Create username on the system, with authorized ssh_keys."""
 -- 
-1.8.5.2 (Apple Git-48)
+1.8.5.5
 

sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/google-compute-daemon-1.1.1-r2.ebuild

@@ -23,7 +23,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/0001-Fixes-authorized_keys-file-permissions.patch
 	epatch "${FILESDIR}"/0001-fix-google-daemon-use-for-the-passwd-not.patch
 	epatch "${FILESDIR}"/0001-hack-address_manager-use-CoreOS-names-and-locations.patch
-	epatch "${FILESDIR}"/0001-feat-accounts-add-users-to-the-sudo-group-by-default.patch
+	epatch "${FILESDIR}"/0001-feat-accounts-add-users-to-the-sudo-and-docker-group.patch
 }
 
 src_install() {

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild

@@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~x86"
 else
-	CROS_WORKON_COMMIT="bfb269beb9c59cd4b8c0caac4eda92f3d1a427eb"
+	CROS_WORKON_COMMIT="1375c793ba0227987a9b8673e94e112f3a98c8e8"
 	KEYWORDS="amd64 arm x86"
 fi
 

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/oem-release

@@ -1 +0,0 @@
-gce