Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kolla Ansible
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Very Demiurge Very Mindful
Kolla Ansible
Commits
f370edfb
Commit
f370edfb
authored
9 years ago
by
Martin André
Browse files
Options
Downloads
Patches
Plain Diff
Add retry parameter to build-docker-image
Partial-Bug: #1466677 Change-Id: I2fc2ded47bb2ed34fb1e272d35b0758f098ce0ac
parent
999a51b6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/build-docker-image
+19
-1
19 additions, 1 deletion
tools/build-docker-image
with
19 additions
and
1 deletion
tools/build-docker-image
+
19
−
1
View file @
f370edfb
...
@@ -13,6 +13,7 @@ NAMESPACE=kollaglue
...
@@ -13,6 +13,7 @@ NAMESPACE=kollaglue
PREFIX
=
centos-rdo-
PREFIX
=
centos-rdo-
TAG
=
$(
git rev-parse
--short
HEAD
)
TAG
=
$(
git rev-parse
--short
HEAD
)
RELEASE_TAG
=
latest
RELEASE_TAG
=
latest
MAX_TRIES
=
1
usage
()
{
usage
()
{
cat
<<
EOF
cat
<<
EOF
...
@@ -30,13 +31,14 @@ Options:
...
@@ -30,13 +31,14 @@ Options:
--pull, -u
--pull, -u
--release
--release
--no-use-released-parent
--no-use-released-parent
--retry <number_of_retries>
EOF
EOF
}
}
[
-f
$TOPDIR
/.buildconf
]
&&
.
$TOPDIR
/.buildconf
[
-f
$TOPDIR
/.buildconf
]
&&
.
$TOPDIR
/.buildconf
[
-f
$IMGDIR
/.buildconf
]
&&
.
$IMGDIR
/.buildconf
[
-f
$IMGDIR
/.buildconf
]
&&
.
$IMGDIR
/.buildconf
ARGS
=
$(
getopt
-o
hr:n:t:pfuN
-l
help
,prefix:,namespace:,push,pull,private-registry:,release,tag:,force-rm,no-cache,no-use-released-parent
--
"
$@
"
)
||
{
usage
>
&2
;
exit
2
;
}
ARGS
=
$(
getopt
-o
hr:n:t:pfuN
-l
help
,prefix:,namespace:,push,pull,private-registry:,release,tag:,force-rm,no-cache,no-use-released-parent
,retry:
--
"
$@
"
)
||
{
usage
>
&2
;
exit
2
;
}
eval set
--
"
$ARGS
"
eval set
--
"
$ARGS
"
...
@@ -88,6 +90,11 @@ while :; do
...
@@ -88,6 +90,11 @@ while :; do
USE_CURRENT_TAG
=
1
USE_CURRENT_TAG
=
1
;;
;;
(
--retry
)
shift
MAX_TRIES
=
$((
MAX_TRIES
+
$1
))
;;
(
--
)
break
(
--
)
break
;;
;;
...
@@ -142,10 +149,21 @@ sed -i.bak "s|%%KOLLA_NAMESPACE%%|${NAMESPACE}|g" $TMPDIR/Dockerfile
...
@@ -142,10 +149,21 @@ sed -i.bak "s|%%KOLLA_NAMESPACE%%|${NAMESPACE}|g" $TMPDIR/Dockerfile
sed
-i
.bak
"s|%%KOLLA_PREFIX%%|
${
PREFIX
}
|g"
$TMPDIR
/Dockerfile
sed
-i
.bak
"s|%%KOLLA_PREFIX%%|
${
PREFIX
}
|g"
$TMPDIR
/Dockerfile
sed
-i
.bak
"s|%%KOLLA_TAG%%|
${
PARENT_TAG
}
|g"
$TMPDIR
/Dockerfile
sed
-i
.bak
"s|%%KOLLA_TAG%%|
${
PARENT_TAG
}
|g"
$TMPDIR
/Dockerfile
TRY
=
0
while
[
$((
MAX_TRIES
-
1
))
-gt
$TRY
]
;
do
if
docker build
${
BUILDFLAGS
}
-t
"
$FULLIMAGE
"
$TMPDIR
;
then
break
else
echo
"WARNING: failed to build
$FULLIMAGE
, retrying..."
TRY
=
$((
TRY
+
1
))
fi
done
if
!
docker build
${
BUILDFLAGS
}
-t
"
$FULLIMAGE
"
$TMPDIR
;
then
if
!
docker build
${
BUILDFLAGS
}
-t
"
$FULLIMAGE
"
$TMPDIR
;
then
echo
"ERROR: failed to build
$FULLIMAGE
"
echo
"ERROR: failed to build
$FULLIMAGE
"
exit
1
exit
1
fi
fi
rm
-rf
$TMPDIR
rm
-rf
$TMPDIR
echo
"Built:
$FULLIMAGE
"
echo
"Built:
$FULLIMAGE
"
...
...
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