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
c14f36b9
Commit
c14f36b9
authored
11 months ago
by
Bert Palm
Browse files
Options
Downloads
Plain Diff
Merge branch '90-create-worker-crontab-setup' into 'main'
Resolve "create worker-crontab-setup" Closes
#90
See merge request
!140
parents
8da6201c
8e5a7311
No related branches found
No related tags found
1 merge request
!140
Resolve "create worker-crontab-setup"
Pipeline
#382655
passed
11 months ago
Stage: integration
Stage: end-to-end
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cron/crontab.txt
+1
-1
1 addition, 1 deletion
cron/crontab.txt
docker-compose-dev.example.yml
+4
-0
4 additions, 0 deletions
docker-compose-dev.example.yml
docker-compose.yml
+34
-2
34 additions, 2 deletions
docker-compose.yml
with
39 additions
and
3 deletions
cron/crontab.txt
+
1
−
1
View file @
c14f36b9
15,45 * * * * /usr/bin/python3
$HOME
/scripts/sms_sync/sms_cv_tables.py > $STDOUT 2>$STDERR
15,45 * * * * /usr/bin/python3 /scripts/sms_sync/sms_cv_tables.py > $STDOUT 2>$STDERR
This diff is collapsed.
Click to expand it.
docker-compose-dev.example.yml
+
4
−
0
View file @
c14f36b9
...
...
@@ -38,6 +38,10 @@ services:
volumes
:
-
"
${DEV_DISPATCHER_SRC_DIR:-../tsm-dispatcher/src}:/home/appuser/app/src"
worker-crontab-setup
:
volumes
:
-
"
${DEV_DISPATCHER_SRC_DIR:-../tsm-dispatcher/src}:/home/appuser/app/src"
basic-demo-scheduler
:
volumes
:
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
34
−
2
View file @
c14f36b9
...
...
@@ -359,6 +359,7 @@ services:
user
:
"
appuser"
volumes
:
-
"
frontend-statics:/home/appuser/app/static"
-
"
sftp-private-keys:/home/appuser/app/sftp-private-keys"
-
"
./frontend/user.json:/home/appuser/app/tsm/fixtures/user.json"
-
"
./frontend/thing.json:/home/appuser/app/tsm/fixtures/thing.json"
entrypoint
:
"
"
...
...
@@ -690,6 +691,26 @@ services:
${CREATEDB_POSTGRES_DATABASE}"
worker-crontab-setup
:
image
:
"
registry.hzdr.de/ufz-tsm/tsm-dispatcher/dispatcher:${DISPATCHER_IMAGE_TAG}"
restart
:
"
${RESTART}"
depends_on
:
mqtt-broker
:
condition
:
"
service_healthy"
environment
:
LOG_LEVEL
:
"
${LOG_LEVEL}"
TOPIC
:
"
thing_creation"
MQTT_BROKER
:
"
mqtt-broker:1883"
MQTT_USER
:
"
${MQTT_USER}"
MQTT_PASSWORD
:
"
${MQTT_PASSWORD}"
MQTT_CLIENT_ID
:
"
crontab-setup"
MQTT_CLEAN_SESSION
:
"
${MQTT_CLEAN_SESSION}"
MQTT_QOS
:
"
${MQTT_QOS}"
volumes
:
-
"
./cron/crontab.txt:/tmp/crontab.txt"
command
:
-
"
update-sftp-crontab"
# =================================================================
# other worker
# =================================================================
...
...
@@ -758,6 +779,15 @@ services:
SMS_API_TOKEN
:
"
${CRON_SMS_API_TOKEN}"
CV_ACCESS_TYPE
:
"
${CRON_CV_ACCESS_TYPE}"
CV_API_URL
:
"
${CRON_CV_API_URL}"
# The following is needed for sftp sync jobs
LOG_LEVEL
:
"
${LOG_LEVEL}"
MINIO_URL
:
"
${MINIO_HOST}"
MINIO_SECURE
:
"
${MINIO_SECURE}"
FTP_AUTH_DB_DSN
:
"
postgresql://
\
${FRONTEND_POSTGRES_USER}:
\
${FRONTEND_POSTGRES_PASS}@
\
${FRONTEND_POSTGRES_HOST}/
\
${FRONTEND_POSTGRES_DB}"
healthcheck
:
test
:
[
"
CMD-SHELL"
,
"
service
cron
status
||
exit
1"
]
interval
:
5s
...
...
@@ -765,7 +795,8 @@ services:
retries
:
5
volumes
:
-
"
./cron/crontab.txt:/tmp/crontab.txt:ro"
-
"
./cron/scripts:/home/tsm/scripts:ro"
-
"
./cron/scripts:/scripts:ro"
-
"
sftp-private-keys:/sftp-private-keys:ro"
mqtt-cat
:
restart
:
"
${RESTART}"
...
...
@@ -803,4 +834,5 @@ services:
-
"
/var/lib/docker/:/var/lib/docker:ro"
volumes
:
frontend-statics
:
\ No newline at end of file
frontend-statics
:
sftp-private-keys
:
\ 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