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

#62 format and clean code

parent 1aa0a5a1
No related branches found
Tags feat-mac-001
1 merge request!1Feature/macos
......@@ -36,28 +36,30 @@ function startContainer {
if [[ -n ${ID} ]]; then
docker start ${COMPOSE_PROJECT_NAME}_l3d
else
start_params=(--user ${USERID}:${GROUPID} \
--hostname ${COMPOSE_PROJECT_NAME}-l3d \
--group-add ${GROUPIDS// / --group-add } \
--env L3DSHELL=${L3DSHELL} \
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
--env PHP_VERSION=${PHP_VERSION} \
--env SSH_AUTH_SOCK=${SSHAUTHSOCK} \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume ${WORKDIR}:/drupal \
--volume ${SSHAUTH}:${SSHAUTHSOCK} \
--volume ${HOMEDIR}:${HOMEDIR} \
--workdir /drupal \
--restart unless-stopped \
)
start_params=(
--user ${USERID}:${GROUPID}
--hostname ${COMPOSE_PROJECT_NAME}-l3d
--group-add ${GROUPIDS// / --group-add }
--env L3DSHELL=${L3DSHELL}
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}
--env PHP_VERSION=${PHP_VERSION}
--env SSH_AUTH_SOCK=${SSHAUTHSOCK}
--volume /var/run/docker.sock:/var/run/docker.sock
--volume ${WORKDIR}:/drupal
--volume ${SSHAUTH}:${SSHAUTHSOCK}
--volume ${HOMEDIR}:${HOMEDIR}
--workdir /drupal
--restart unless-stopped
)
if [[ ${L3DHOSTOS} != Darwin ]]; then
start_params+=( --volume /etc/group:/etc/group:ro \
--volume /etc/passwd:/etc/passwd:ro \
--volume /etc/shadow:/etc/shadow:ro \
--volume /etc/sudoers:/etc/sudoers:ro \
--volume /etc/sudoers.d:/etc/sudoers.d:ro \
)
start_params+=(
--volume /etc/group:/etc/group:ro
--volume /etc/passwd:/etc/passwd:ro
--volume /etc/shadow:/etc/shadow:ro
--volume /etc/sudoers:/etc/sudoers:ro
--volume /etc/sudoers.d:/etc/sudoers.d:ro
)
fi
docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
"${start_params[@]}" \
......
......@@ -38,15 +38,13 @@ touch ${HOME}/.gitignore_global
ID=$(docker container ls --all -q -f name=^l3drun$)
if [[ ! -n ${ID} ]]; then
# 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+=(--volume ${SSHAUTHMAGICPATH}:${SSHAUTHMAGICPATH})
fi
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
)
# Execute l3drun container
docker run --name=l3drun -dt --rm \
"${l3drun_params[@]}" \
......@@ -75,24 +73,26 @@ fi
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} \
)
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} \
)
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
/usr/local/bin/run $@
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