Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

Commit

Permalink
Mac fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Willie Seabrook committed Apr 4, 2016
1 parent aac1a35 commit 07ca1c7
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 19 deletions.
9 changes: 8 additions & 1 deletion .ahoy/arch.ahoy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,11 @@ commands:
DEFAULT_SOURCE="$HOME/.default.docker-machine"
docker-machine env $MACHINE_NAME | grep -v "^#" > $DEFAULT_SOURCE
source $DEFAULT_SOURCE
echo "source $DEFAULT_SOURCE" >> $(ahoy rcfile)
if [ $(grep -E '(AHOY_CMD_PROXY="DOCKER"|AHOY_CMD_PROXY=DOCKER)' $(ahoy rcfile)|wc -l) -eq 0 ]; then
echo "export AHOY_CMD_PROXY=\"DOCKER\"" >> $(ahoy rcfile)
fi
if [ $(grep "source $DEFAULT_SOURCE" $(ahoy rcfile)|wc -l) -eq 0 ]; then
echo "source $DEFAULT_SOURCE" >> $(ahoy rcfile)
fi
echo
echo "[DONE] Please open a new shell to ensure all new environment settings are sourced"
19 changes: 13 additions & 6 deletions .ahoy/debian.ahoy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ commands:
cmd: |
set -e
ahoy arch deps
ahoy arch virtualbox
ahoy arch docker
ahoy arch nfs
ahoy arch machine
ahoy debian deps
ahoy debian virtualbox
ahoy debian docker
ahoy debian nfs
ahoy debian machine
deps:
usage: Install dependencies
Expand Down Expand Up @@ -96,4 +96,11 @@ commands:
DEFAULT_SOURCE="$HOME/.default.docker-machine"
docker-machine env $MACHINE_NAME | grep -v "^#" > $DEFAULT_SOURCE
source $DEFAULT_SOURCE
echo "source $DEFAULT_SOURCE" >> $(ahoy rcfile)
if [ $(grep -E '(AHOY_CMD_PROXY="DOCKER"|AHOY_CMD_PROXY=DOCKER)' $(ahoy rcfile)|wc -l) -eq 0 ]; then
echo "export AHOY_CMD_PROXY=\"DOCKER\"" >> $(ahoy rcfile)
fi
if [ $(grep "source $DEFAULT_SOURCE" $(ahoy rcfile)|wc -l) -eq 0 ]; then
echo "source $DEFAULT_SOURCE" >> $(ahoy rcfile)
fi
echo
echo "[DONE] Please open a new shell to ensure all new environment settings are sourced"
28 changes: 16 additions & 12 deletions .ahoy/mac.ahoy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ commands:
cmd: |
set -e
ahoy arch deps
ahoy arch virtualbox
ahoy arch docker
ahoy arch nfs
ahoy arch machine
ahoy mac deps
ahoy mac virtualbox
ahoy mac docker
ahoy mac nfs
ahoy mac machine
deps:
usage: Install dependencies
Expand Down Expand Up @@ -53,8 +53,8 @@ commands:
echo "*** Installing docker-machine..."
brew install docker-machine
echo "*** Installing docker-machine..."
brew install docker-machine
echo "*** Installing docker-compose..."
brew install docker-compose
nfs:
usage: Install NFS
Expand All @@ -77,13 +77,17 @@ commands:
docker-machine create --driver virtualbox $MACHINE_NAME
echo "*** Setting up the default docker-machine with NFS..."
docker-machine-nfs $MACHINE_NAME
echo "*** Starting docker-machine $MACHINE_NAME..."
docker-machine start $MACHINE_NAME
docker-machine-nfs $MACHINE_NAME --shared-folder=$HOME/docker
echo "*** Environment variables setup and sourcing for the default machine..."
DEFAULT_SOURCE="$HOME/.default.docker-machine"
docker-machine env $MACHINE_NAME | grep -v "^#" > $DEFAULT_SOURCE
source $DEFAULT_SOURCE
echo "source $DEFAULT_SOURCE" >> $(ahoy rcfile)
if [ $(grep -E '(AHOY_CMD_PROXY="DOCKER"|AHOY_CMD_PROXY=DOCKER)' $(ahoy rcfile)|wc -l) -eq 0 ]; then
echo "export AHOY_CMD_PROXY=\"DOCKER\"" >> $(ahoy rcfile)
fi
if [ $(grep "source $DEFAULT_SOURCE" $(ahoy rcfile)|wc -l) -eq 0 ]; then
echo "source $DEFAULT_SOURCE" >> $(ahoy rcfile)
fi
echo
echo "[DONE] Please open a new shell to ensure all new environment settings are sourced"

0 comments on commit 07ca1c7

Please sign in to comment.