Archives/falk-werner_webfuse
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse synced 2025-06-13 12:54:15 +00:00
Code Issues Releases Wiki Activity

fixes mount of project in wrapper scripts, when not running in container

Browse Source
This commit is contained in:
nosamad 2019-04-09 19:42:07 +02:00
parent 500353115c
commit 5d6dc552c5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/docker_compose.sh
View File

@ -4,10 +4,12 @@ set -e
DOCKER="${DOCKER:-docker}" DOCKER="${DOCKER:-docker}"
DOCKER_HOST="${DOCKER_HOST:-/var/run/docker.sock}" DOCKER_HOST="${DOCKER_HOST:-/var/run/docker.sock}"
IMAGE="${IMAGE:-${REGISTRY_PREFIX}docker/compose:1.24.0}" VERSION="${VERSION:-1.24.0}"
IMAGE="${IMAGE:-${REGISTRY_PREFIX}docker/compose:${VERSION}}"
NETWORK="${NETWORK:-host}" NETWORK="${NETWORK:-host}"
USERID="${USERID:-$(id -u)}" USERID="${USERID:-$(id -u)}"
SCRIPT_ROOT="${SCRIPT_ROOT:-"$(cd "$(dirname "$0")" && echo "$PWD")"}" SCRIPT_ROOT="${SCRIPT_ROOT:-"$(cd "$(dirname "$0")" && echo "$PWD")"}"
PROJECT_ROOT="${PROJECT_ROOT:-"$(cd "$SCRIPT_ROOT/.." && echo "$PWD")"}"
ENTRYPOINT="${ENTRYPOINT:-docker-compose}" ENTRYPOINT="${ENTRYPOINT:-docker-compose}"
HOST_ENVFILTER="${HOST_ENVFILTER:-^DOCKER_\|^COMPOSE_}" HOST_ENVFILTER="${HOST_ENVFILTER:-^DOCKER_\|^COMPOSE_}"
@ -24,7 +26,9 @@ fi
HOST_CONTAINER="${HOST_CONTAINER:-"$("$SCRIPT_ROOT/get_container_id.sh")"}" || true HOST_CONTAINER="${HOST_CONTAINER:-"$("$SCRIPT_ROOT/get_container_id.sh")"}" || true
if [ -n "$HOST_CONTAINER" ]; then if [ -n "$HOST_CONTAINER" ]; then
set -- --volumes-from "$HOST_CONTAINER" "$@" set -- --volumes-from "$HOST_CONTAINER" "$@"
else
set -- --volume "$PROJECT_ROOT:$PROJECT_ROOT:cached" "$@"
fi fi
# setup options for connection to docker host # setup options for connection to docker host

4
build/run_image.sh.template
View File

@ -31,7 +31,9 @@ fi
HOST_CONTAINER="${HOST_CONTAINER:-"$("$SCRIPT_ROOT/get_container_id.sh")"}" || true HOST_CONTAINER="${HOST_CONTAINER:-"$("$SCRIPT_ROOT/get_container_id.sh")"}" || true
if [ -n "$HOST_CONTAINER" ]; then if [ -n "$HOST_CONTAINER" ]; then
set -- --volumes-from "$HOST_CONTAINER" "$@" set -- --volumes-from "$HOST_CONTAINER" "$@"
else
set -- --volume "$PROJECT_ROOT:$PROJECT_ROOT:cached" "$@"
fi fi
set -- %RUNFLAGS% "$@" set -- %RUNFLAGS% "$@"