Merge pull request #99 from TheNewNormal/v1.5.3

v1.5.3

README.md

@@ -35,7 +35,7 @@ How to install CoreOS VM for macOS
 - CoreOS ISO files are stored under `~/.coreos/images` folder
 - Mac user home folder is automaticly mounted via NFS (it has to work on Mac end of course) to `/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
-- After successful install you can control CoreOS VM via `corevm` cli as well. Cli resides in `~/coreos-osx/bin` folder and has simple commands: `corevm start|stop|status|ip`, it is specially handy for automation tasks. Just copy the `corevm` to your pre-set path.
+- After successful install you can control CoreOS VM via `corevm` cli as well. Cli resides in `~/coreos-osx/bin` folder and has simple commands: `corevm start|stop|status|ip|shell|ssh`, it is specially handy for automation tasks. Just copy the `corevm` to your pre-set path.
 
 
 **The install will do the following:**

src/CoreOS/CoreOS-Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.2</string>
+	<string>1.5.3</string>
 	<key>CFBundleVersion</key>
-	<string>539</string>
+	<string>541</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/bin/corevm

@@ -23,6 +23,13 @@ ip() {
     echo "$(~/bin/corectl q -i core-01)"
 }
 
+ssh() {
+    ~/bin/corectl ssh k8solo-01
+}
+
+shell() {
+    "${app_path}"/os_shell.command
+}
 
 usage() {
     echo "Usage: corevm start|stop|status|ip"
@@ -42,6 +49,12 @@ case "$1" in
         ip)
                 ip
                 ;;
+        ssh)
+                ssh
+                ;;
+        shell)
+                shell
+                ;;
         *)
                 usage
                 ;;

src/coreos-osx-install.command

@@ -22,6 +22,7 @@ source "${DIR}"/functions.sh
     # copy files to ~/coreos-osx/bin
     cp -f "$1"/bin/* ~/coreos-osx/bin
     chmod 755 ~/coreos-osx/bin/*
+    cp -f "$1"/bin/corevm ~/bin
 
     # copy user-data
     cp -f "$1"/cloud-init/* ~/coreos-osx/cloud-init

src/up.command

@@ -33,6 +33,7 @@ fi
 # copy bin files to bin folder
 cp -f "${res_folder}"/bin/* ~/coreos-osx/bin
 chmod 755 ~/coreos-osx/bin/*
+cp -f "${res_folder}"/bin/corevm ~/bin
 
 # add ssh key to Keychain
 if ! ssh-add -l | grep -q ssh/id_rsa; then