diff --git a/README.md b/README.md index 7807c29..fce389c 100644 --- a/README.md +++ b/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:** diff --git a/src/CoreOS.xcodeproj/project.xcworkspace/xcuserdata/rimas1.xcuserdatad/UserInterfaceState.xcuserstate b/src/CoreOS.xcodeproj/project.xcworkspace/xcuserdata/rimas1.xcuserdatad/UserInterfaceState.xcuserstate index d218e74..fdfddbf 100644 Binary files a/src/CoreOS.xcodeproj/project.xcworkspace/xcuserdata/rimas1.xcuserdatad/UserInterfaceState.xcuserstate and b/src/CoreOS.xcodeproj/project.xcworkspace/xcuserdata/rimas1.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/src/CoreOS/CoreOS-Info.plist b/src/CoreOS/CoreOS-Info.plist index de4a4a2..ae01943 100644 --- a/src/CoreOS/CoreOS-Info.plist +++ b/src/CoreOS/CoreOS-Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.2 + 1.5.3 CFBundleVersion - 539 + 541 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/src/bin/corevm b/src/bin/corevm index 7e19a5e..30b3b55 100755 --- a/src/bin/corevm +++ b/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 ;; diff --git a/src/coreos-osx-install.command b/src/coreos-osx-install.command index 6a6b766..7909af6 100755 --- a/src/coreos-osx-install.command +++ b/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 diff --git a/src/files/iTerm2.zip b/src/files/iTerm2.zip index d7bd3ba..89199b0 100644 Binary files a/src/files/iTerm2.zip and b/src/files/iTerm2.zip differ diff --git a/src/up.command b/src/up.command index 412e005..0060845 100755 --- a/src/up.command +++ b/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