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
10115eb3
Commit
10115eb3
authored
6 years ago
by
jurgenhaas
Browse files
Options
Downloads
Patches
Plain Diff
#18
Always use --all when listing containers
parent
813852ea
Branches
Branches containing commit
Tags
feat-mac-002
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
run/scripts/start
+2
-2
2 additions, 2 deletions
run/scripts/start
run/scripts/update
+1
-1
1 addition, 1 deletion
run/scripts/update
setup/scripts/l3d
+1
-1
1 addition, 1 deletion
setup/scripts/l3d
with
4 additions
and
4 deletions
run/scripts/start
+
2
−
2
View file @
10115eb3
...
...
@@ -19,7 +19,7 @@ function getConfig {
function
startContainer
{
if
[[
-n
${
COMPOSE_PROJECT_NAME
}
]]
;
then
ID
=
$(
docker container
ls
-q
-f
name
=
${
COMPOSE_PROJECT_NAME
}
_l3d
)
ID
=
$(
docker container
ls
--all
-q
-f
name
=
${
COMPOSE_PROJECT_NAME
}
_l3d
)
if
[[
-n
${
ID
}
]]
;
then
docker start
${
COMPOSE_PROJECT_NAME
}
_l3d
else
...
...
@@ -44,7 +44,7 @@ function startContainer {
}
if
[[
-n
$1
]]
;
then
ID
=
$(
docker container
ls
-q
-f
name
=
$1_l3d
)
ID
=
$(
docker container
ls
--all
-q
-f
name
=
$1_l3d
)
if
[[
-n
${
ID
}
]]
;
then
PHP_VERSION
=
unknown
COMPOSE_PROJECT_NAME
=
$1
...
...
This diff is collapsed.
Click to expand it.
run/scripts/update
+
1
−
1
View file @
10115eb3
...
...
@@ -12,7 +12,7 @@ if [[ -n ${PHP_VERSION} ]]; then
IMAGEID
=
$(
docker image
ls
-q
registry.lakedrops.com/docker/l3d/php-
${
PHP_VERSION
}
|
grep
-v
${
NEWIMAGEID
}
)
if
[[
-n
${
IMAGEID
}
]]
;
then
while
true
;
do
ID
=
$(
docker container
ls
-q
-f
ancestor
=
${
IMAGEID
}
)
ID
=
$(
docker container
ls
--all
-q
-f
ancestor
=
${
IMAGEID
}
)
if
[[
-n
${
ID
}
]]
;
then
echo
"Removing outdated container ..."
docker
kill
${
ID
}
>
/dev/null
...
...
This diff is collapsed.
Click to expand it.
setup/scripts/l3d
+
1
−
1
View file @
10115eb3
#!/bin/bash
ID
=
$(
docker container
ls
-q
-f
name
=
l3drun
)
ID
=
$(
docker container
ls
--all
-q
-f
name
=
l3drun
)
if
[[
!
-n
${
ID
}
]]
;
then
SCRIPTPATH
=
"
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
-P
)
"
docker run
--name
=
l3drun
-dt
--rm
\
...
...
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