Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
rimusz committed May 6, 2014
2 parents 066da3c + ec327d2 commit 1163e90
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ For now it only supports a standalone CoreOS VM, cluster support might come at s
DOCKER_HOST=tcp://localhost:4243
FLEETCTL_TUNNEL=127.0.0.1:2222
Path to ~/coreos-osx/bin where docker, etcdclt and fleetctl binaries are stored
ssh-add ~/.vagrant.d/insecure_private_key for the fleetctl tunnel to work properly
````
* ````Setup/Update```` ````Check for updates```` will update to the latest docker, etcdclt and fleetctl OS X clients
* ````SSH```` will open VM shell
Expand Down
2 changes: 1 addition & 1 deletion src/CoreOS GUI/CoreOS GUI-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.4.1</string>
<string>0.4.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
3 changes: 3 additions & 0 deletions src/coreos-vagrant-install.command
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
# create the "share" folder share
mkdir ~/coreos-osx/share

# create the "logs" folder share
mkdir ~/coreos-osx/logs

# download latest coreos-vagrant
git clone https://github.com/coreos/coreos-vagrant/ ~/coreos-osx/coreos-vagrant

Expand Down
2 changes: 2 additions & 0 deletions src/vagrant_up.command
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ eval $(echo "export PATH=$PATH:${HOME}/coreos-osx/bin")
# set fleetctl tunnel
eval $(echo "export FLEETCTL_TUNNEL=127.0.0.1:2222")

ssh-add ~/.vagrant.d/insecure_private_key

cd ~/coreos-osx/share

/bin/bash
Expand Down

0 comments on commit 1163e90

Please sign in to comment.