Commit 73281fa6 authored by Dave Cooper's avatar Dave Cooper
Browse files

dunno

parent 3d140b21
Loading
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ echo "gendl_user=${gendl_user}"
echo "GENDL_MODE=${GENDL_MODE}"
echo "ENABLE_DOCKER=${ENABLE_DOCKER}"

DOCKER_MOUNT_OPTIONS="--mount type=bind,src=${USER_PROJECTS},dst=/home/${gendl_user}/${PROJECTS_BASENAME}"
PROJECTS_MOUNT_OPTIONS="--mount type=bind,src=${USER_PROJECTS},dst=/home/${gendl_user}/${PROJECTS_BASENAME}"

# Add Docker socket mount if enabled
DOCKER_SOCKET_OPTIONS=""
@@ -167,16 +167,14 @@ if [ -d "/tmp/.X11-unix" ]; then
    echo "X11 forwarding enabled"
fi

DOCKER_SWITCHES="${DOCKER_SWITCHES:-it}"

DOCKER_GENDL_CID=$(docker run "-$DOCKER_SWITCHES" --rm -h gendl --name gendl-${branch}-${impl} \
DOCKER_GENDL_CID=$(docker run -id  --rm -h gendl --name gendl-${branch}-${impl} \
                          -p ${SWANK_HOST_PORT}:${SWANK_PORT} -p ${HTTP_HOST_PORT}:${HTTP_PORT} \
                          -p ${HTTPS_HOST_PORT}:${HTTPS_PORT} \
                          -e HTTP_PORT -e HTTPS_PORT -e HTTP_HOST_PORT -e HTTPS_HOST_PORT \
			  -e SWANK_PORT -e SWANK_HOST_PORT -e TELNET_PORT -e TELNET_HOST_PORT \
                          -e START_HTTP -e START_HTTPS -e START_SWANK -e START_TELNET \
                          -e HOST_USER_UID -e GENDL_MODE \
                          ${DOCKER_MOUNT_OPTIONS} \
                          ${PROJECTS_MOUNT_OPTIONS} \
                          ${DOCKER_SOCKET_OPTIONS} \
                          ${X11_OPTIONS} \
                          --add-host host.docker.internal:172.17.0.1 \