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
2226f696
Commit
2226f696
authored
4 years ago
by
Felix Häberle
Browse files
Options
Downloads
Patches
Plain Diff
#45
add new variable SSHAUTHSOCKORIGIN
parent
d2aaeb48
No related branches found
No related tags found
No related merge requests found
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
+7
-1
7 additions, 1 deletion
setup/scripts/l3d
with
8 additions
and
1 deletion
run/scripts/start
+
1
−
0
View file @
2226f696
...
...
@@ -30,6 +30,7 @@ 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
...
...
This diff is collapsed.
Click to expand it.
setup/scripts/l3d
+
7
−
1
View file @
2226f696
...
...
@@ -12,7 +12,9 @@ case "${L3DHOSTOS}" in
# This works on MacOS when coreutils is installed.
SCRIPTPATH
=
"
$(
dirname
"
$(
greadlink
-f
"
$0
"
)
"
)
"
fi
${
SCRIPTPATH
}
/prepareMac4L3d
#${SCRIPTPATH}/prepareMac4L3d
SSHAUTHSOCKORIGIN
=
${
SSHAUTHSOCK
}
SSHAUTHSOCK
=
"/run/host-services/ssh-auth.sock"
if
[[
$?
>
0
]]
;
then
exit
$?
fi
...
...
@@ -34,6 +36,9 @@ 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 }}'
...
...
@@ -54,6 +59,7 @@ 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
}
\
...
...
This diff is collapsed.
Click to expand it.
jurgenhaas
@jurgenhaas
mentioned in commit
53933f4f
·
4 years ago
mentioned in commit
53933f4f
mentioned in commit 53933f4f61e69baf4b9f8331a88d52cf09ed7d2a
Toggle commit list
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