Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
1f40e75a
Commit
1f40e75a
authored
Jul 11, 2017
by
Dr. Stefan Schimanski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Workaround docker-wait freeze with 17.06.0
parent
07449649
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
common.sh
build/common.sh
+7
-1
No files found.
build/common.sh
View file @
1f40e75a
...
...
@@ -384,7 +384,13 @@ function kube::build::short_hash() {
# a workaround for bug https://github.com/docker/docker/issues/3968.
function
kube::build::destroy_container
()
{
"
${
DOCKER
[@]
}
"
kill
"
$1
"
>
/dev/null 2>&1
||
true
"
${
DOCKER
[@]
}
"
wait
"
$1
"
>
/dev/null 2>&1
||
true
if
[[
$(
"
${
DOCKER
[@]
}
"
version
--format
'{{.Server.Version}}'
)
=
17.06.0
*
]]
;
then
# Workaround https://github.com/moby/moby/issues/33948.
# TODO: remove when 17.06.0 is not relevant anymore
DOCKER_API_VERSION
=
v1.29
"
${
DOCKER
[@]
}
"
wait
"
$1
"
>
/dev/null 2>&1
||
true
else
"
${
DOCKER
[@]
}
"
wait
"
$1
"
>
/dev/null 2>&1
||
true
fi
"
${
DOCKER
[@]
}
"
rm
-f
-v
"
$1
"
>
/dev/null 2>&1
||
true
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment