From 8af22b5b376a3a9d8655aa56ad45292c2f4e2314 Mon Sep 17 00:00:00 2001 From: Arian Acosta Date: Sat, 15 Jul 2017 18:32:05 -0400 Subject: [PATCH] finalizing changes --- sync-services.txt | 1 - sync.sh | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 sync-services.txt diff --git a/sync-services.txt b/sync-services.txt deleted file mode 100644 index dbe16ddf..00000000 --- a/sync-services.txt +++ /dev/null @@ -1 +0,0 @@ -nginx mysql \ No newline at end of file diff --git a/sync.sh b/sync.sh index f5144a0a..9a7df180 100755 --- a/sync.sh +++ b/sync.sh @@ -3,15 +3,19 @@ # This shell script is an optional tool to simplify # the installation and usage of laradock with docker-sync. +# Make sure that the DOCKER_SYNC_STRATEGY is set in the .env +# DOCKER_SYNC_STRATEGY=native_osx # osx +# DOCKER_SYNC_STRATEGY=unison # windows + # To run, make sure to add permissions to this file: # chmod 755 sync.sh -# Usage: +# USAGE EXAMPLE: # Install docker-sync: ./sync.sh install # Start sync and services with nginx and mysql: ./sync.sh up nginx mysql # Stop containers and sync: ./sync.sh down # Open bash inside the workspace: ./sync.sh bash -# Force sync: ./sync.sh sync trigger +# Force sync: ./sync.sh sync # Clean synced files: ./sync.sh clean # prints colored text @@ -41,8 +45,8 @@ display_options () { print_style " up [services]" "success"; printf "\t Starts docker-sync and runs docker compose.\n" print_style " down" "success"; printf "\t\t\t Stops containers and docker-sync.\n" print_style " bash" "success"; printf "\t\t\t Opens bash on the workspace.\n" - print_style " trigger" "success"; printf "\t\t Manually triggers the synchronization of files.\n" - print_style " clean" "warning"; printf "\t\t Removes all files from docker-sync.\n" + print_style " sync" "success"; printf "\t\t Manually triggers the synchronization of files.\n" + print_style " clean" "danger"; printf "\t\t Removes all files from docker-sync.\n" } if [[ $# -eq 0 ]] ; then @@ -52,16 +56,13 @@ if [[ $# -eq 0 ]] ; then fi if [ "$1" == "up" ] ; then - value=$(