Merge pull request #16 from linuxserver/run.sh

Update run.sh with changes from upstream.

Author: aptalca

readme-vars.yml

@@ -78,9 +78,9 @@ full_custom_readme: |
     up
   ```
   You can replace the last line with any docker-compose command and argument, which will be passed to docker-compose inside the image.
-  
+
   ### Recommended method
-  
+
   We provide a very convenient script that allows the docker-compose container to run as if it was installed natively:
   ```
   sudo curl -L --fail https://raw.githubusercontent.com/linuxserver/docker-docker-compose/master/run.sh -o /usr/local/bin/docker-compose
@@ -131,6 +131,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **04.10.20:** - Update run.sh with changes from upstream.
   * **31.08.20:** - Update tox and virtualenv.
   * **31.07.20:** - Add support for global env var `DOCKER_COMPOSE_IMAGE_TAG` in the `run.sh` script.
   * **06.07.20:** - Publish docker-compose and docker-cli binaries in Github releases.

run.sh

@@ -26,10 +26,10 @@ IMAGE="linuxserver/docker-compose:$DOCKER_COMPOSE_IMAGE_TAG"
 
 # Setup options for connecting to docker host
 if [ -z "$DOCKER_HOST" ]; then
-    DOCKER_HOST="/var/run/docker.sock"
+    DOCKER_HOST='unix:///var/run/docker.sock'
 fi
-if [ -S "$DOCKER_HOST" ]; then
-    DOCKER_ADDR="-v $DOCKER_HOST:$DOCKER_HOST -e DOCKER_HOST"
+if [ -S "${DOCKER_HOST#unix://}" ]; then
+    DOCKER_ADDR="-v ${DOCKER_HOST#unix://}:${DOCKER_HOST#unix://} -e DOCKER_HOST"
 else
     DOCKER_ADDR="-e DOCKER_HOST -e DOCKER_TLS_VERIFY -e DOCKER_CERT_PATH"
 fi
@@ -41,7 +41,13 @@ if [ "$(pwd)" != '/' ]; then
 fi
 if [ -n "$COMPOSE_FILE" ]; then
     COMPOSE_OPTIONS="$COMPOSE_OPTIONS -e COMPOSE_FILE=$COMPOSE_FILE"
-    compose_dir=$(realpath "$(dirname "$COMPOSE_FILE")")
+    compose_dir="$(dirname "$COMPOSE_FILE")"
+    # canonicalize dir, do not use realpath or readlink -f
+    # since they are not available in some systems (e.g. macOS).
+    compose_dir="$(cd "$compose_dir" && pwd)"
+fi
+if [ -n "$COMPOSE_PROJECT_NAME" ]; then
+    COMPOSE_OPTIONS="-e COMPOSE_PROJECT_NAME $COMPOSE_OPTIONS"
 fi
 # TODO: also check --file argument
 if [ -n "$compose_dir" ]; then