Merge pull request #91 from TheNewNormal/v1.4.7

v1.4.7

README.md

@@ -6,7 +6,7 @@ CoreOS VM for macOS
 It leverages macOS native Hypervisor framework of using [xhyve](https://github.com/xhyve-xyz/xhyve) based [corectl](https://github.com/TheNewNormal/corectl) command line tool without any needs to use VirtualBox or similar virtualisation software.
 
 The best use case of this App is to allow to build/test [Docker](https://www.docker.com) and [rkt](https://coreos.com/rkt/) images localy.
-You can use included [Docker Registry v2](https://github.com/docker/distribution) (Go based and compiled for macOS) to store
+You can push your Docker images to [Docker Registry](https://github.com/docker/distribution) on `192.168.64.1:5000` run by [Corectl App](https://github.com/TheNewNormal/corectl.app), to store
 your Docker images and share with Kubernetes Apps for macOS: [Kube-solo](https://github.com/TheNewNormal/kube-solo-osx) and [Kube-Cluster](https://github.com/TheNewNormal/kube-cluster-osx)
 
 ![CoreOS-OSX](coreos-osx.png "CoreOS-OSX")
@@ -29,8 +29,7 @@ How to install CoreOS VM for macOS
 **TL;DR**
 
 - App's files are installed to `~/coreos-osx` folder
-- CoreOS ISO files are stored under `~/.coreos` folder
-- Docker registry runs on `192.168.64.1:5000` and images are stored under `~/coreos-osx/registry`
+- CoreOS ISO files are stored under `~/.coreos/images` folder
 - Mac user home folder can be enabled via `Setup\Enable shared NFS user home folder` to automaticly mounted to VM: `/Users/my_user`:`/Users/my_user` on each VM boot
 - macOS `docker` client is installed to `~/coreos-osx/bin` and preset in `OS shell` to be used from there
 
@@ -84,9 +83,8 @@ and docker-exec shell scripts are stored
 * `Updates/Check for update of docker macOS client` will update fleet and docker macOS clients to the same versions as CoreOS VM runs.
 * [UI for Docker](https://github.com/kevana/ui-for-docker) will show up all running containers and etc
 * You can upload your saved/exported docker images place in `~/coreos-osx/docker_images` folder via `Upload docker images`
-* Local Docker Registry v2 (Go based and compiled for  macOS) is running on `192.168.64.1:5000`, which gets started/stopped on each VM Up/Halt.
-* Persistent disk `data.img` will be created and mounted to `/data` to these mount binds (data persists between reboots):
-* 
+* Persistent sparse disk `data.img` will be created and mounted to `/data` to these mount binds (data persists between reboots):
+
 ```
 /data/var/lib/docker -> /var/lib/docker
 /data/var/lib/rkt -> /var/lib/rkt

src/CoreOS.xcodeproj/project.pbxproj

@@ -39,8 +39,6 @@
 		134182F61D2A9DD7001021BD /* enable_disable_nfs.command in Resources */ = {isa = PBXBuildFile; fileRef = 134182F51D2A9DD7001021BD /* enable_disable_nfs.command */; };
 		134AB3371BD7ECAB00D55BC4 /* upload_docker_images.command in Resources */ = {isa = PBXBuildFile; fileRef = 134AB3361BD7ECAB00D55BC4 /* upload_docker_images.command */; };
 		137018AC1C11E9D00002B2B9 /* cloud-init in Resources */ = {isa = PBXBuildFile; fileRef = 137018AB1C11E9D00002B2B9 /* cloud-init */; };
-		137018B21C11F0DE0002B2B9 /* registry in Resources */ = {isa = PBXBuildFile; fileRef = 137018B11C11F0DE0002B2B9 /* registry */; };
-		137018B41C11F1FD0002B2B9 /* docker_registry.sh in Resources */ = {isa = PBXBuildFile; fileRef = 137018B31C11F1FD0002B2B9 /* docker_registry.sh */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -84,8 +82,6 @@
 		134182F51D2A9DD7001021BD /* enable_disable_nfs.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = enable_disable_nfs.command; sourceTree = "<group>"; };
 		134AB3361BD7ECAB00D55BC4 /* upload_docker_images.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = upload_docker_images.command; sourceTree = "<group>"; };
 		137018AB1C11E9D00002B2B9 /* cloud-init */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "cloud-init"; sourceTree = SOURCE_ROOT; };
-		137018B11C11F0DE0002B2B9 /* registry */ = {isa = PBXFileReference; lastKnownFileType = folder; path = registry; sourceTree = SOURCE_ROOT; };
-		137018B31C11F1FD0002B2B9 /* docker_registry.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = docker_registry.sh; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -107,7 +103,6 @@
 				019662171B04C6EA005FA955 /* files */,
 				137018AB1C11E9D00002B2B9 /* cloud-init */,
 				019662131B04C598005FA955 /* settings */,
-				137018B11C11F0DE0002B2B9 /* registry */,
 				01741B56190DB7B800BB1F91 /* coreos-osx-install.command */,
 				01741B62190DB80500BB1F91 /* first-init.command */,
 			);
@@ -160,7 +155,6 @@
 				1309B1F51D34ED590054C730 /* check_app_version_github.command */,
 				01B675D51B602FC2004349CC /* check_vm_status.command */,
 				13164EB91D2D2E8400642B0A /* run_corectl_app.command */,
-				137018B31C11F1FD0002B2B9 /* docker_registry.sh */,
 				01741B64190DB81400BB1F91 /* up.command */,
 				0106B3491B65277F001709E0 /* functions.sh */,
 				01CFC2DB1A2AA48300F251C2 /* change_release_channel.command */,
@@ -271,15 +265,13 @@
 				01D3685918E5C184006510B5 /* icon.icns in Resources */,
 				01E285B818A6D7F400BC630D /* icon.png in Resources */,
 				133DD1211CE49AB900059FCC /* InfoPlist.strings in Resources */,
-				137018B41C11F1FD0002B2B9 /* docker_registry.sh in Resources */,
 				0145318418FF209D007F9C95 /* ssh.command in Resources */,
 				01CFC2DF1A2AA48300F251C2 /* destroy.command in Resources */,
 				133DD1231CE49AB900059FCC /* Images.xcassets in Resources */,
 				134182F61D2A9DD7001021BD /* enable_disable_nfs.command in Resources */,
 				133DD11F1CE49AB900059FCC /* CoreOS.entitlements in Resources */,
 				01741B65190DB81400BB1F91 /* up.command in Resources */,
 				133DD1221CE49AB900059FCC /* MainMenu.strings in Resources */,
-				137018B21C11F0DE0002B2B9 /* registry in Resources */,
 				137018AC1C11E9D00002B2B9 /* cloud-init in Resources */,
 				133DD11D1CE49AB900059FCC /* MainMenu.xib in Resources */,
 				01993A4F1B63DD730096E2E1 /* halt.command in Resources */,
@@ -424,7 +416,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx10.11]" = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
@@ -444,7 +435,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx10.11]" = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;

src/CoreOS/CoreOS-Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.6</string>
+	<string>1.4.7</string>
 	<key>CFBundleVersion</key>
-	<string>527</string>
+	<string>529</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/coreos-osx-install.command

@@ -10,7 +10,6 @@
     mkdir ~/coreos-osx/bin
     mkdir ~/coreos-osx/cloud-init
     mkdir ~/coreos-osx/settings
-    mkdir ~/coreos-osx/registry
     mkdir ~/coreos-osx/docker_images
     mkdir ~/coreos-osx/rkt_images
 
@@ -27,9 +26,6 @@
     # copy settings
     cp -f "$1"/settings/* ~/coreos-osx/settings
 
-    # copy docker registry config
-    cp -f "$1"/registry/config.yml ~/coreos-osx/registry
-
     # check if iTerm.app exists
     App="/Applications/iTerm.app"
     if [ ! -d "$App" ]

src/destroy.command

@@ -32,10 +32,6 @@ do
         # send halt to VM
         /usr/local/sbin/corectl halt core-01 > /dev/null 2>&1
 
-        # Stop docker registry
-        "${res_folder}"/docker_registry.sh stop
-        kill $(ps aux | grep "[r]egistry config.yml" | awk {'print $2'}) > /dev/null 2>&1
-
         # delete data image
         rm -f ~/coreos-osx/data.img
 

src/first-init.command

@@ -31,13 +31,6 @@ release_channel
 # create ROOT disk
 create_data_disk
 
-# Start docker registry
-cd ~/coreos-osx/registry
-echo " "
-"${res_folder}"/docker_registry.sh start
-"${res_folder}"/docker_registry.sh start > /dev/null 2>&1
-
-
 # Start VM
 cd ~/coreos-osx
 echo " "
@@ -83,8 +76,6 @@ echo "Installation has finished, CoreOS VM is up and running !!!"
 echo " "
 echo "Assigned static IP for VM: $vm_ip"
 echo " "
-echo "Docker Registry is on: 192.168.64.1:5000 "
-echo " "
 echo "You can control this App via status bar icon... "
 echo " "
 

src/functions.sh

@@ -213,10 +213,6 @@ res_folder=$(cat ~/coreos-osx/.env/resouces_path)
 # send halt to VM
 /usr/local/sbin/corectl halt core-01 > /dev/null 2>&1
 
-# Stop docker registry
-"${res_folder}"/docker_registry.sh stop
-kill $(ps aux | grep "[r]egistry config.yml" | awk {'print $2'})
-
 # kill all other scripts
 pkill -f [C]oreOS.app/Contents/Resources/fetch_latest_iso.command
 pkill -f [C]oreOS.app/Contents/Resources/update_osx_clients_files.command

src/halt.command

@@ -11,6 +11,3 @@ export PATH=${HOME}/coreos-osx/bin:$PATH
 # send halt to VM
 /usr/local/sbin/corectl halt core-01
 
-# Stop docker registry
-"${res_folder}"/docker_registry.sh stop
-kill $(ps aux | grep "[r]egistry config.yml" | awk {'print $2'}) >/dev/null 2>&1

src/up.command

@@ -34,12 +34,6 @@ fi
 cp -f "${res_folder}"/bin/* ~/coreos-osx/bin
 chmod 755 ~/coreos-osx/bin/*
 
-# copy registry files
-cp -f "${res_folder}"/registry/config.yml ~/coreos-osx/registry
-cp -f "${res_folder}"/bin/registry ~/coreos-osx/bin
-chmod 755 ~/coreos-osx/bin/registry
-
-
 # add ssh key to Keychain
 if ! ssh-add -l | grep -q ssh/id_rsa; then
   ssh-add -K ~/.ssh/id_rsa &>/dev/null
@@ -57,12 +51,6 @@ if [ ! -f $HOME/coreos-osx/data.img ]; then
 fi
 #
 
-# Start docker registry
-cd ~/coreos-osx/registry
-echo " "
-"${res_folder}"/docker_registry.sh start
-"${res_folder}"/docker_registry.sh start > /dev/null 2>&1
-
 # Start VM
 cd ~/coreos-osx
 echo " "