Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tsm-orchestration
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
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
UFZ TSM
tsm-orchestration
Commits
44fbaa67
Commit
44fbaa67
authored
8 months ago
by
Joost Hemmen
Browse files
Options
Downloads
Plain Diff
Merge branch 'release-2024-07' into 'main'
Release 2024 07 See merge request
!173
parents
01857a5b
f9332986
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!173
Release 2024 07
Pipeline
#400332
failed
8 months ago
Stage: integration
Stage: end-to-end
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker-compose.yml
+4
-2
4 additions, 2 deletions
docker-compose.yml
releases/2024-07.env
+10
-0
10 additions, 0 deletions
releases/2024-07.env
with
14 additions
and
2 deletions
docker-compose.yml
+
4
−
2
View file @
44fbaa67
...
...
@@ -751,7 +751,8 @@ services:
restart
:
"
${RESTART}"
# Prevent blocking/slowing-down of other services if many scheduler jobs occur at
# the same time. Cap the processing power to equivalent of one CPU of the system.
cpus
:
1.0
cpus
:
0.5
mem_limit
:
"
4g"
healthcheck
:
test
:
[
"
CMD-SHELL"
,
"
curl
--fail
http://localhost:5000/health
||
exit
1"
]
interval
:
10s
...
...
@@ -776,7 +777,8 @@ services:
restart
:
"
${RESTART}"
# Prevent blocking/slowing-down of other services if many scheduler jobs occur at
# the same time. Cap the processing power to equivalent of one CPU of the system.
cpus
:
1.0
cpus
:
0.5
mem_limit
:
"
4g"
environment
:
SETUP_SERVICE
:
"
${CRON_SETUP_SERVICE}"
CREATEDB_POSTGRES_USER
:
"
${CRON_CREATEDB_POSTGRES_USER}"
...
...
This diff is collapsed.
Click to expand it.
releases/2024-07.env
0 → 100644
+
10
−
0
View file @
44fbaa67
OBJECT_STORAGE_IMAGE_TAG=RELEASE.2024-06-29T01-20-47Z
MQTT_BROKER_IMAGE_TAG=2.1.0-mosquitto_1.6.14
GRAFANA_IMAGE_TAG=10.4.5
TSM_DL_IMAGE_TAG=2024-07-01-170831
FRONTEND_IMAGE_TAG=2024-06-19-140757
NGINX_IMAGE_TAG=1.27.0
DISPATCHER_IMAGE_TAG=2024-07-04-020316
SCHEDULER_IMAGE_TAG=2024-07-04-060315
MQTT_CAT_IMAGE_TAG=2.0.18
MONITORING_IMAGE_TAG=v0.47.2
\ No newline at end of file
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