Merge pull request #98 from TheNewNormal/v1.5.2

v1.5.2
TheNewNormal · Oct 28, 2016 · f423529 · f423529
2 parents ac47c1a + 8cc085c
commit f423529
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 15 deletions.
diff --git a/...codeproj/project.xcworkspace/xcuserdata/rimas1.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/rimas1.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/src/CoreOS.xcodeproj/xcuserdata/rimas1.xcuserdatad/xcschemes/xcschememanagement.plist b/src/CoreOS.xcodeproj/xcuserdata/rimas1.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>01E2853918A6C4E300BC630D</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/src/CoreOS/CoreOS-Info.plist b/src/CoreOS/CoreOS-Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.1</string>
+	<string>1.5.2</string>
 	<key>CFBundleVersion</key>
-	<string>537</string>
+	<string>539</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/bin/docker2aci b/src/bin/docker2aci
diff --git a/src/bin/registry b/src/bin/registry
diff --git a/src/cloud-init/user-data b/src/cloud-init/user-data
@@ -16,6 +16,19 @@ coreos:
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
     advertise-client-urls:  http://0.0.0.0:2379,http://0.0.0.0:4001
   units:
+    - name: docker-tcp.socket
+      command: start
+      enable: true
+      content: |
+        [Unit]
+        Description=Docker Socket for the API
+        [Socket]
+        ListenStream=2375
+        BindIPv6Only=both
+        Service=docker.service
+
+        [Install]
+        WantedBy=sockets.target
     - name: format-persistent-disk.service
       command: start
       content: |
@@ -116,19 +129,6 @@ coreos:
             After=var-lib-docker.mount flanneld.service
             [Service]
             Environment=DOCKER_OPTS='--insecure-registry="0.0.0.0/0"'
-    - name: docker-tcp.socket
-      command: start
-      enable: true
-      content: |
-        [Unit]
-        Description=Docker Socket for the API
-        [Socket]
-        ListenStream=2375
-        BindIPv6Only=both
-        Service=docker.service
-
-        [Install]
-        WantedBy=sockets.target
     - name: update-engine.service
       command: stop
     - name: dockerui.service