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
ec46c78d
Commit
ec46c78d
authored
2 years ago
by
jurgenhaas
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into 'main'
Merging develop into main See merge request
!17
parents
597b9d09
e17e37d6
Branches
Branches containing commit
Tags
v2.4.1
v2.4.2
Tags containing commit
1 merge request
!17
Merging develop into main
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
run/scripts/list
+1
-1
1 addition, 1 deletion
run/scripts/list
run/scripts/start
+11
-4
11 additions, 4 deletions
run/scripts/start
with
12 additions
and
5 deletions
run/scripts/list
+
1
−
1
View file @
ec46c78d
...
...
@@ -26,7 +26,7 @@ function listnetworks() {
fi
printf
"Active L3D networks:"
for
NETWORKID
in
`
cat
/tmp/l3d.lst
`
;
do
printf
" %s"
"
$(
docker inspect
$NETWORKID
| jq
-r
.[0].Name |
cut
-d
'_'
-f
2
)
"
printf
" %s"
"
$(
docker inspect
$NETWORKID
| jq
-r
.[0].Name |
cut
-d
'_'
-f
1
)
"
done
echo
""
rm
/tmp/l3d.lst
...
...
This diff is collapsed.
Click to expand it.
run/scripts/start
+
11
−
4
View file @
ec46c78d
...
...
@@ -125,11 +125,18 @@ function startContainer() {
return
fi
fi
start_params
=(
--env
HOMEDIR
=
${
HOMEDIR
}
--env
WORKDIR
=
${
WORKDIR
}
--env
SSHAUTH
=
${
SSHAUTH
}
)
if
[[
"
$PHP_VERSION
"
!=
"unknown"
]]
;
then
start_params+
=(
--env
PHP_VERSION
=
${
PHP_VERSION
}
)
fi
docker
exec
-it
\
--env
HOMEDIR
=
${
HOMEDIR
}
\
--env
WORKDIR
=
${
WORKDIR
}
\
--env
SSHAUTH
=
${
SSHAUTH
}
\
--env
PHP_VERSION
=
${
PHP_VERSION
}
\
"
${
start_params
[@]
}
"
\
${
COMPOSE_PROJECT_NAME
}
_l3d
\
/usr/local/bin/.start
exitContainer
...
...
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