EOX GitLab Instance
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ESA
PRISM
VS
Commits
b30208fc
Commit
b30208fc
authored
4 years ago
by
Fabian Schindler
Browse files
Options
Downloads
Patches
Plain Diff
Adding optional timeout parameter to service waiting
parent
1420653d
No related branches found
No related tags found
1 merge request
!6
Cache native swift
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
cache/entrypoint.sh
+2
-1
2 additions, 1 deletion
cache/entrypoint.sh
core/Dockerfile
+1
-1
1 addition, 1 deletion
core/Dockerfile
core/entrypoint.sh
+2
-1
2 additions, 1 deletion
core/entrypoint.sh
preprocessor/entrypoint.sh
+2
-1
2 additions, 1 deletion
preprocessor/entrypoint.sh
with
7 additions
and
4 deletions
cache/entrypoint.sh
+
2
−
1
View file @
b30208fc
#!/bin/bash -e
SERVICES
=
${
WAIT_SERVICES
:
=
''
}
TIMEOUT
=
${
WAIT_TIMEOUT
:
=
'15'
}
if
[[
!
-z
$SERVICES
]]
;
then
for
service
in
$SERVICES
;
do
wait-for-it
$service
wait-for-it
-t
$TIMEOUT
$service
done
fi
...
...
This diff is collapsed.
Click to expand it.
core/Dockerfile
+
1
−
1
View file @
b30208fc
...
...
@@ -42,7 +42,6 @@ RUN apt update && \
apt clean
&&
\
rm
-rf
/var/lib/apt/lists/
*
/tmp/
*
/var/tmp/
*
RUN
pip3
install
.
&&
\
pip3
install
python-keystoneclient python-swiftclient redis
...
...
@@ -76,6 +75,7 @@ ADD rgbnir_definition.json \
run-httpd.sh \
run-registrar.sh \
registrar.py \
mapcache_items_view.sql \
entrypoint.sh \
/
...
...
This diff is collapsed.
Click to expand it.
core/entrypoint.sh
+
2
−
1
View file @
b30208fc
#!/bin/bash -e
SERVICES
=
${
WAIT_SERVICES
:
=
''
}
TIMEOUT
=
${
WAIT_TIMEOUT
:
=
'15'
}
if
[[
!
-z
$SERVICES
]]
;
then
for
service
in
$SERVICES
;
do
wait-for-it
$service
wait-for-it
-t
$TIMEOUT
$service
done
fi
...
...
This diff is collapsed.
Click to expand it.
preprocessor/entrypoint.sh
+
2
−
1
View file @
b30208fc
#!/bin/bash -e
SERVICES
=
${
WAIT_SERVICES
:
=
''
}
TIMEOUT
=
${
WAIT_TIMEOUT
:
=
'15'
}
if
[[
!
-z
$SERVICES
]]
;
then
for
service
in
$SERVICES
;
do
wait-for-it
$service
wait-for-it
-t
$TIMEOUT
$service
done
fi
...
...
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