v0.3.6

Author: rimusz

README.md

@@ -2,16 +2,6 @@ CoreOS-Vagrant Cluster GUI for OS X
 ============================
 
 CoreOS-Vagrant Cluster GUI for Mac OS X is a Mac Status bar App which works like a wrapper around the [coreos-vagrant](https://github.com/coreos/coreos-vagrant) command line tool and bootstraps CoreOS cluster with one control (etcd) and two worker machines. Flannel network is set too.
-
-Supports etcd2 in all CoreOS release channels.
-
-####Note: OS X El Capitan:
-
-* If you do a fresh install OS X El Capitan support will be enabled
-
-* Otherwise run: `ln -s /opt/vagrant/bin/vagrant /usr/local/bin/vagrant >/dev/null 2>&1`
-
-
 
 [CoreOS](https://coreos.com) is a Linux distribution made specifically to run [Docker](https://www.docker.io/) containers.
 [CoreOS-Vagrant](https://github.com/coreos/coreos-vagrant) is made to run on VirtualBox and VMWare VMs.
@@ -62,8 +52,9 @@ Just start `CoreOS Cluster GUI` application and you will find a small icon with
 * [Fleet-UI](http://fleetui.com) dashboard will show running fleet units and etc
 
 
-Other links
+Other Apps
 -----------
-* A standalone CoreOS VM version of OS X App can be found here [CoreOS-Vagrant GUI](https://github.com/rimusz/coreos-osx-gui).
-
+* Standalone CoreOS VM version of OS X App can be found here [CoreOS-OSX GUI](https://github.com/rimusz/coreos-osx-gui).
+* Kubernetes Solo Cluster VM App can be found here [Kube Solo](https://github.com/rimusz/kube-solo-osx)
+* Kubernetes Solo Vagrant based Cluster VM App can be found here [CoreOS-Vagrant Kubernetes Solo GUI](https://github.com/rimusz/coreos-osx-gui-kubernetes-solo)
 * Kubernetes Cluster one CoreOS VM of OS X App can be found here [CoreOS-Vagrant Kubernetes Cluster GUI ](https://github.com/rimusz/coreos-osx-gui-kubernetes-cluster).

src/CoreOS Cluster GUI.xcodeproj/project.pbxproj

@@ -225,7 +225,7 @@
 		01E2853218A6C4E300BC630D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = "Rimantas Mocevicius";
 				TargetAttributes = {
 					01E2853918A6C4E300BC630D = {
@@ -348,6 +348,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -363,7 +364,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 			};
@@ -395,7 +396,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				SDKROOT = macosx;
 			};
 			name = Release;
@@ -411,6 +412,7 @@
 				GCC_PREFIX_HEADER = "CoreOS Cluster GUI/CoreOS Cluster GUI-Prefix.pch";
 				INFOPLIST_FILE = "CoreOS Cluster GUI/CoreOS Cluster GUI-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				PRODUCT_BUNDLE_IDENTIFIER = "net.linxos.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "CoreOS Cluster GUI";
 				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;
@@ -428,6 +430,7 @@
 				GCC_PREFIX_HEADER = "CoreOS Cluster GUI/CoreOS Cluster GUI-Prefix.pch";
 				INFOPLIST_FILE = "CoreOS Cluster GUI/CoreOS Cluster GUI-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				PRODUCT_BUNDLE_IDENTIFIER = "net.linxos.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "CoreOS Cluster GUI";
 				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;

src/CoreOS Cluster GUI/CoreOS Cluster GUI-Info.plist

@@ -11,19 +11,19 @@
 	<key>CFBundleIconFile</key>
 	<string>icon</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.linxos.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.5</string>
+	<string>0.3.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>119</string>
+	<string>121</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/first-init.command

@@ -28,15 +28,17 @@ sed -i "" 's/172.17.8.#{i+100}/172.17.9.#{i+101}/g' ~/coreos-osx-cluster/workers
 cp ~/coreos-osx-cluster/tmp/config.rb.sample ~/coreos-osx-cluster/control/config.rb
 sed -i "" 's/#$instance_name_prefix="core"/$instance_name_prefix="control"/' ~/coreos-osx-cluster/control/config.rb
 sed -i "" 's/#$vm_memory = 1024/$vm_memory = 512/' ~/coreos-osx-cluster/control/config.rb
+sed -i "" 's/File.open/#File.open/' ~/coreos-osx-cluster/control/config.rb
 # nodes
 cp ~/coreos-osx-cluster/tmp/config.rb.sample ~/coreos-osx-cluster/workers/config.rb
 sed -i "" 's/#$instance_name_prefix="core"/$instance_name_prefix="node"/' ~/coreos-osx-cluster/workers/config.rb
+sed -i "" 's/File.open/#File.open/' ~/coreos-osx-cluster/workers/config.rb
 # set nodes to 2
 sed -i "" 's/$num_instances=1/$num_instances=2/' ~/coreos-osx-cluster/workers/config.rb
 
 # clean up tmp folder
-rm -rf ~/coreos-osx-cluster/tmp/*
-rm -rf ~/coreos-osx-cluster/tmp/.*
+rm -rf ~/coreos-osx-cluster/tmp/* >/dev/null 2>&1 &
+rm -rf ~/coreos-osx-cluster/tmp/.* >/dev/null 2>&1 &
 
 ###
 

src/fleet/fleet-ui.service

@@ -14,7 +14,7 @@ ExecStart=/usr/bin/docker run --rm --name fleet_ui --memory="128m" \
  -e ETCD_PEER=172.17.9.101 \
  -v /home/core/.ssh/id_rsa:/root/id_rsa \
  purpleworks/fleet-ui
-ExecStop=/usr/bin/docker stop fleet_ui
+ExecStop=/usr/bin/docker kill fleet_ui
 ExecStopPost=-/usr/bin/docker rm fleet_ui
 
 Restart=always