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

#57 Mount the sudoers.d config, mount into correct home directory, add all group IDs

parent c4f41bbb
No related branches found
No related tags found
No related merge requests found
...@@ -38,6 +38,7 @@ function startContainer { ...@@ -38,6 +38,7 @@ function startContainer {
docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \ docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
--hostname ${COMPOSE_PROJECT_NAME}-l3d \ --hostname ${COMPOSE_PROJECT_NAME}-l3d \
--user ${USERID}:${GROUPID} \ --user ${USERID}:${GROUPID} \
--group-add ${GROUPIDS// / --group-add } \
--env L3DSHELL=${L3DSHELL} \ --env L3DSHELL=${L3DSHELL} \
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \ --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \ --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
...@@ -49,11 +50,12 @@ function startContainer { ...@@ -49,11 +50,12 @@ function startContainer {
--volume /etc/passwd:/etc/passwd:ro \ --volume /etc/passwd:/etc/passwd:ro \
--volume /etc/shadow:/etc/shadow:ro \ --volume /etc/shadow:/etc/shadow:ro \
--volume /etc/sudoers:/etc/sudoers:ro \ --volume /etc/sudoers:/etc/sudoers:ro \
--volume /etc/sudoers.d:/etc/sudoers.d:ro \
--volume ${SSHAUTH}:${SSHAUTHSOCK} \ --volume ${SSHAUTH}:${SSHAUTHSOCK} \
--volume ${HOMEDIR}/.traefik:/root/.traefik \ --volume ${HOMEDIR}/.traefik:${HOMEDIR}/.traefik \
--volume ${HOMEDIR}/.gitconfig:/root/.gitconfig \ --volume ${HOMEDIR}/.gitconfig:${HOMEDIR}/.gitconfig \
--volume ${HOMEDIR}/.gitignore_global:/root/.gitignore_global \ --volume ${HOMEDIR}/.gitignore_global:${HOMEDIR}/.gitignore_global \
--volume ${HOMEDIR}/.composer/auth.json:/root/.composer/auth.json \ --volume ${HOMEDIR}/.composer/auth.json:${HOMEDIR}/.composer/auth.json \
--workdir /drupal \ --workdir /drupal \
--restart unless-stopped \ --restart unless-stopped \
registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION} registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION}
......
...@@ -51,9 +51,11 @@ if [[ -f ".env" ]]; then ...@@ -51,9 +51,11 @@ if [[ -f ".env" ]]; then
fi fi
export USERID=$(id -u) export USERID=$(id -u)
export GROUPID=$(id -g) export GROUPID=$(id -g)
export GROUPIDS=$(id -G)
docker exec -it \ docker exec -it \
--env USERID=${USERID} \ --env USERID=${USERID} \
--env GROUPID=${GROUPID} \ --env GROUPID=${GROUPID} \
--env GROUPIDS="${GROUPIDS}" \
--env HOMEDIR=${HOME} \ --env HOMEDIR=${HOME} \
--env L3DSHELL=${L3DSHELL} \ --env L3DSHELL=${L3DSHELL} \
--env WORKDIR=${PWD} \ --env WORKDIR=${PWD} \
......
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