Skip to content

Commit

Permalink
Small doc tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
jennydaman committed Mar 2, 2018
1 parent e1075f2 commit 053f80c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitattributes
@@ -0,0 +1 @@
* text eol=lf
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -24,6 +24,7 @@ The wrapper script `lets_talk.sh` makes it easier to launch this application. It

```bash
chmod +x lets_talk.sh # executable permission
./lets_talk.sh -h # show usage flags
./lets_talk.sh # connect to host port 8080
sudo PORT=80 ./lets_talk.sh # OR connect to host port 80
```
Expand Down
6 changes: 3 additions & 3 deletions lets_talk.sh
Expand Up @@ -13,7 +13,7 @@ optional arguments:
This flag doesn't work with Windows.
-b (re-)build images.
-n don't start the server.
-p prune orphaned docker stuff.
-p prune orphaned docker stuff. (this is an alternative to "-c" on Windows.)
-d start server with development configuration (mount server folders instead of copying).
-w force use of Windows workarounds.
-u ignore detection of Windows + Docker Toolbox, forces regular docker configuration.
Expand Down Expand Up @@ -196,15 +196,15 @@ if [ "$build" = "1" ]; then
fi

if [ "$skip" = "0" ]; then

[ "$windows" = "off" ] && windows=0
if [ "$windows" = "0" ]; then
if [ "$dev" = "1" ]; then
PORT=$PORT docker-compose --file dev-compose.yml up --abort-on-container-exit
else
PORT=$PORT docker-compose up --abort-on-container-exit # run normally
fi
else
PORT=$PORT docker-compose --file windows-compose.yml up --abort-on-container-exit # TODO test
PORT=$PORT docker-compose --file windows-compose.yml up --abort-on-container-exit
fi
else
echo 'The flag "-n" was specified. Exiting now...'
Expand Down

0 comments on commit 053f80c

Please sign in to comment.