Skip to content
Snippets Groups Projects
Commit 1a1a2243 authored by Felix Häberle's avatar Felix Häberle :speech_balloon:
Browse files

#62 update mac adjustments based on review

parent 9e5d28a1
No related branches found
No related tags found
1 merge request!1Feature/macos
......@@ -2,6 +2,7 @@
SSHAUTH=${SSH_AUTH_SOCK}
SSHAUTHSOCK=/ssh-agent
L3DHOSTOS="$(uname -s)"
case "${L3DHOSTOS}" in
Darwin*)
......@@ -34,27 +35,28 @@ touch ${HOME}/.gitconfig
touch ${HOME}/.gitignore_global
ID=$(docker container ls --all -q -f name=^l3drun$)
if [[ ! -n ${ID} ]]; then
case "${L3DHOSTOS}" in
Darwin*)
docker run --name=l3drun -dt --rm \
--env SCRIPTPATH=${SCRIPTPATH} \
--env SSH_AUTH_SOCK=${SSHAUTHMAGICPATH} \
--volume ${SSHAUTHMAGICPATH}:${SSHAUTHMAGICPATH} \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume ${SCRIPTPATH}:/setup \
--volume ${HOME}/.traefik:/root/.traefik \
registry.lakedrops.com/docker/l3d/run:'{{ version }}'
;;
*)
docker run --name=l3drun -dt --rm \
--env SCRIPTPATH=${SCRIPTPATH} \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume ${SCRIPTPATH}:/setup \
--volume ${HOME}/.traefik:/root/.traefik \
registry.lakedrops.com/docker/l3d/run:'{{ version }}'
esac
# Create l3drun container parameters
l3drun_params=( --env L3DHOSTOS=${L3DHOSTOS} \
--env SCRIPTPATH=${SCRIPTPATH} \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume ${SCRIPTPATH}:/setup \
--volume ${HOME}/.traefik:/root/.traefik \
)
if [[ ${L3DHOSTOS} == Darwin ]]; then
l3drun_params+=( --env SSH_AUTH_SOCK=${SSHAUTHMAGICPATH} \
--volume ${SSHAUTHMAGICPATH}:${SSHAUTHMAGICPATH} \
)
fi
# Execute l3drun container
if [[ ! -n ${ID} ]]; then
docker run --name=l3drun -dt --rm \
"${l3drun_params[@]}" \
registry.lakedrops.com/docker/l3d/run:v1.8.2-mac0.3
fi
# Set l3d shell
if [[ -n ${L3DSHELL} ]]; then
# Nothing to do, we go with this value
L3DSHELL=${L3DSHELL}
......@@ -63,44 +65,37 @@ elif [[ -n ${SHELL} ]]; then
else
L3DSHELL="/usr/bin/fish"
fi
# Read environment variables
if [[ -f "${HOME}/.env" ]]; then
export $(cat ${HOME}/.env | xargs) > /dev/null 2>&1
fi
if [[ -f ".env" ]]; then
export $(cat .env | xargs) > /dev/null 2>&1
fi
case "${L3DHOSTOS}" in
Darwin*)
export GROUPIDS=$(id -G)
docker exec -it \
--env GROUPIDS="${GROUPIDS}" \
--env HOMEDIR=${HOME} \
--env L3DSHELL=${L3DSHELL} \
--env WORKDIR=${PWD} \
--env SSHAUTH=${SSHAUTH} \
--env SSHAUTHSOCK=${SSHAUTHSOCK} \
--env PHP_VERSION=${PHP_VERSION} \
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
l3drun \
/usr/local/bin/run $@
;;
*)
export USERID=$(id -u)
export GROUPID=$(id -g)
export GROUPIDS=$(id -G)
docker exec -it \
--env USERID=${USERID} \
--env GROUPID=${GROUPID} \
--env GROUPIDS="${GROUPIDS}" \
--env HOMEDIR=${HOME} \
--env L3DSHELL=${L3DSHELL} \
--env WORKDIR=${PWD} \
--env SSHAUTH=${SSHAUTH} \
--env SSHAUTHSOCK=${SSHAUTHSOCK} \
--env PHP_VERSION=${PHP_VERSION} \
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
l3drun \
/usr/local/bin/run $@
esac
# Create project container parameters
export USERID=$(id -u)
export GROUPID=$(id -g)
export GROUPIDS=$(id -G)
project_params=(--env GROUPIDS="${GROUPIDS}" \
--env HOMEDIR=${HOME} \
--env L3DSHELL=${L3DSHELL} \
--env WORKDIR=${PWD} \
--env SSHAUTH=${SSHAUTH} \
--env SSHAUTHSOCK=${SSHAUTHSOCK} \
--env PHP_VERSION=${PHP_VERSION} \
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
)
if [[ ${L3DHOSTOS} != Darwin ]]; then
project_params+=(--env USERID=${USERID} \
--env GROUPID=${GROUPID} \
)
fi
# Execute project container
docker exec -it \
"${project_params[@]}" \
l3drun \
/usr/local/bin/run $@
\ No newline at end of file
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