Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
LakeDropsDrupalDev
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Docker
LakeDropsDrupalDev
Commits
5a8de692
Commit
5a8de692
authored
4 years ago
by
jurgenhaas
Browse files
Options
Downloads
Patches
Plain Diff
Use group id 1 on Mac
parent
6efad191
No related branches found
No related tags found
1 merge request
!1
Feature/macos
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
run/scripts/start
+1
-0
1 addition, 0 deletions
run/scripts/start
setup/scripts/l3d
+1
-1
1 addition, 1 deletion
setup/scripts/l3d
with
2 additions
and
1 deletion
run/scripts/start
+
1
−
0
View file @
5a8de692
...
...
@@ -40,6 +40,7 @@ function startContainer {
--hostname
${
COMPOSE_PROJECT_NAME
}
-l3d
--user
${
USERID
}
:
${
GROUPID
}
--group-add
${
GROUPIDS
// / --group-add
}
--env
L3DVERSION
=
${
L3DVERSION
}
\
--env
L3DSHELL
=
${
L3DSHELL
}
--env
COMPOSE_PROJECT_NAME
=
${
COMPOSE_PROJECT_NAME
}
--env
COMPOSER_DOWNGRADE
=
${
COMPOSER_DOWNGRADE
}
...
...
This diff is collapsed.
Click to expand it.
setup/scripts/l3d
+
1
−
1
View file @
5a8de692
...
...
@@ -19,7 +19,7 @@ case "${L3DHOSTOS}" in
SCRIPTPATH
=
"
$(
dirname
"
$(
greadlink
-f
"
$0
"
)
"
)
"
L3DDOCKERHOST
=
"
$(
dirname
"
$(
greadlink
-f
"/var/run/docker.sock"
)
"
)
/docker.sock"
fi
GROUPID
=
$(
cut
-d
:
-f3
< <
(
getent group docker
)
)
GROUPID
=
1
# Write a fake passwd file which will later be mounted into containers.
echo
"
${
USERNAME
}
:x:
${
USERID
}
:
${
GROUPID
}
:
${
USERNAME
}
,,,:/home/
${
USERNAME
}
:
${
L3DSHELL
}
"
>
${
HOME
}
/.passwd
# This variable is used to access the ssh agent on MacOS.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment