Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
alfa
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
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
OZG-Cloud
app
alfa
Commits
d2c66eba
Commit
d2c66eba
authored
2 years ago
by
OZGCloud
Browse files
Options
Downloads
Patches
Plain Diff
Improve start up of dependent services in docker compose
parent
9659fcd6
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
goofy-client/.editorconfig
+4
-1
4 additions, 1 deletion
goofy-client/.editorconfig
goofy-client/apps/goofy-e2e/docker-compose.yml
+9
-2
9 additions, 2 deletions
goofy-client/apps/goofy-e2e/docker-compose.yml
with
13 additions
and
3 deletions
goofy-client/.editorconfig
+
4
−
1
View file @
d2c66eba
...
@@ -34,3 +34,6 @@ end_of_line = lf
...
@@ -34,3 +34,6 @@ end_of_line = lf
charset
=
utf-8
charset
=
utf-8
trim_trailing_whitespace
=
true
trim_trailing_whitespace
=
true
insert_final_newline
=
false
insert_final_newline
=
false
[*.yml]
indent_size
=
2
\ No newline at end of file
This diff is collapsed.
Click to expand it.
goofy-client/apps/goofy-e2e/docker-compose.yml
+
9
−
2
View file @
d2c66eba
...
@@ -46,8 +46,10 @@ services:
...
@@ -46,8 +46,10 @@ services:
ports
:
ports
:
-
9091:9090
-
9091:9090
depends_on
:
depends_on
:
-
ozg-mongodb
ozg-mongodb
:
-
ozg-elastic
condition
:
service_started
ozg-elastic
:
condition
:
service_healthy
ozg-goofy
:
ozg-goofy
:
image
:
docker.ozg-sh.de/goofy:${GOOFY_DOCKER_IMAGE:-snapshot-latest}
image
:
docker.ozg-sh.de/goofy:${GOOFY_DOCKER_IMAGE:-snapshot-latest}
...
@@ -82,6 +84,11 @@ services:
...
@@ -82,6 +84,11 @@ services:
nofile
:
nofile
:
soft
:
65536
soft
:
65536
hard
:
65536
hard
:
65536
healthcheck
:
test
:
[
"
CMD"
,
"
curl"
,
"
-f"
,
"
http://localhost:9200"
]
timeout
:
10s
retries
:
5
start_period
:
30s
ozg-usermanager
:
ozg-usermanager
:
image
:
docker.ozg-sh.de/user-manager:${USERMANAGER_DOCKER_IMAGE:-snapshot-latest}
image
:
docker.ozg-sh.de/user-manager:${USERMANAGER_DOCKER_IMAGE:-snapshot-latest}
...
...
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