Merge pull request #96 from TheNewNormal/v1.5.0

v1.5.0
TheNewNormal · Sep 13, 2016 · eeaccf6 · eeaccf6
2 parents 85b921d + 7428602
commit eeaccf6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/src/CoreOS.xcodeproj/project.pbxproj b/src/CoreOS.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 47;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -221,7 +221,7 @@
 		01E2853218A6C4E300BC630D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Rimantas Mocevicius";
 				TargetAttributes = {
 					01E2853918A6C4E300BC630D = {
@@ -235,7 +235,7 @@
 				};
 			};
 			buildConfigurationList = 01E2853518A6C4E300BC630D /* Build configuration list for PBXProject "CoreOS" */;
-			compatibilityVersion = "Xcode 6.3";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -350,14 +350,19 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -388,14 +393,19 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;

diff --git a/...roj/project.xcworkspace/xcuserdata/rmocevicius.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/rmocevicius.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/src/CoreOS.xcodeproj/xcshareddata/xcschemes/CoreOS GUI.xcscheme b/src/CoreOS.xcodeproj/xcshareddata/xcschemes/CoreOS GUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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.4.9</string>
+	<string>1.5.0</string>
 	<key>CFBundleVersion</key>
-	<string>533</string>
+	<string>535</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/cloud-init/user-data b/src/cloud-init/user-data
@@ -135,9 +135,9 @@ coreos:
         ExecStartPre=-/usr/bin/docker pull uifd/ui-for-docker:latest
         ExecStartPre=-/usr/bin/docker rm dockerui
         ExecStart=/usr/bin/docker run --rm --name dockerui --memory="128m" \
-         -p 9000:9000 \
-         -v /var/run/docker.sock:/docker.sock \
-         uifd/ui-for-docker -e /docker.sock
+         -p 9000:9000 --privileged \
+         -v /var/run/docker.sock:/var/run/docker.sock \
+         uifd/ui-for-docker
         #
         ExecStop=/usr/bin/docker stop dockerui
         ExecStopPost=-/usr/bin/docker rm dockerui

diff --git a/src/functions.sh b/src/functions.sh
@@ -115,15 +115,15 @@ export PATH=${HOME}/coreos-osx/bin:$PATH
 cd ~/coreos-osx/
 echo "  "
 echo "Please type Data disk size in GBs followed by [ENTER]:"
-echo -n "[default is 15]: "
+echo -n "[default is 25]: "
 read disk_size
 if [ -z "$disk_size" ]
 then
     echo " "
-    echo "Creating 15GB sparse disk (QCow2)..."
-    ~/bin/qcow-tool create --size=15GiB data.img
+    echo "Creating 25GB sparse disk (QCow2)..."
+    ~/bin/qcow-tool create --size=25GiB data.img
     echo "-"
-    echo "Created 15GB Data disk"
+    echo "Created 25GB Data disk"
 else
     echo " "
     echo "Creating "$disk_size"GB sparse disk (QCow2)..."