Skip to content
Snippets Groups Projects
Commit 53933f4f authored by jurgenhaas's avatar jurgenhaas
Browse files

Revert "#45 add new variable SSHAUTHSOCKORIGIN" - moved changes to feature branch macos

This reverts commit 2226f696
parent 2226f696
No related branches found
No related tags found
No related merge requests found
......@@ -30,7 +30,6 @@ function getConfig {
}
function startContainer {
SSHAUTHSOCK=${SSHAUTHSOCKORIGIN}
if [[ -n ${COMPOSE_PROJECT_NAME} ]]; then
ID=$(docker container ls --all -q -f name=^${COMPOSE_PROJECT_NAME}_l3d$)
if [[ -n ${ID} ]]; then
......
......@@ -12,9 +12,7 @@ case "${L3DHOSTOS}" in
# This works on MacOS when coreutils is installed.
SCRIPTPATH="$(dirname "$(greadlink -f "$0")")"
fi
#${SCRIPTPATH}/prepareMac4L3d
SSHAUTHSOCKORIGIN=${SSHAUTHSOCK}
SSHAUTHSOCK="/run/host-services/ssh-auth.sock"
${SCRIPTPATH}/prepareMac4L3d
if [[ $? > 0 ]]; then
exit $?
fi
......@@ -36,9 +34,6 @@ ID=$(docker container ls --all -q -f name=^l3drun$)
if [[ ! -n ${ID} ]]; then
docker run --name=l3drun -dt --rm \
--env SCRIPTPATH=${SCRIPTPATH} \
--env SSHAUTHSOCKORIGIN=${SSHAUTHSOCKORIGIN} \
--env SSHAUTHSOCK=${SSHAUTHSOCK} \
--volume /run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume ${SCRIPTPATH}:/setup \
registry.lakedrops.com/docker/l3d/run:'{{ version }}'
......@@ -59,7 +54,6 @@ docker exec -it \
--env L3DSHELL=${L3DSHELL} \
--env WORKDIR=${PWD} \
--env SSHAUTH=${SSHAUTH} \
--env SSHAUTHSOCKORIGIN=${SSHAUTHSOCKORIGIN} \
--env SSHAUTHSOCK=${SSHAUTHSOCK} \
--env PHP_VERSION=${PHP_VERSION} \
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment