diff --git a/docker-compose_dist.yml b/docker-compose_dist.yml index 028143ad..1730cf5b 100644 --- a/docker-compose_dist.yml +++ b/docker-compose_dist.yml @@ -62,7 +62,7 @@ services: # Celery worker for correlation analysis correlation-analysis-worker: - image: omicsdatascience/multiomix:5.1.1-celery + image: omicsdatascience/multiomix:5.1.2-celery restart: 'always' depends_on: - db @@ -79,7 +79,7 @@ services: # Celery worker for feature selection experiments fs-experiments-worker: - image: omicsdatascience/multiomix:5.1.1-celery + image: omicsdatascience/multiomix:5.1.2-celery restart: 'always' depends_on: - db @@ -96,7 +96,7 @@ services: # Celery worker for statistical validations and trained models stats-worker: - image: omicsdatascience/multiomix:5.1.1-celery + image: omicsdatascience/multiomix:5.1.2-celery restart: 'always' depends_on: - db @@ -113,7 +113,7 @@ services: # Celery worker for inference experiments inference-worker: - image: omicsdatascience/multiomix:5.1.1-celery + image: omicsdatascience/multiomix:5.1.2-celery restart: 'always' depends_on: - db @@ -130,7 +130,7 @@ services: # Celery worker for sync CGDSStudies sync-datasets-worker: - image: omicsdatascience/multiomix:5.1.1-celery + image: omicsdatascience/multiomix:5.1.2-celery restart: 'always' depends_on: - db @@ -147,7 +147,7 @@ services: # Django Backend Server web: - image: omicsdatascience/multiomix:5.1.1 + image: omicsdatascience/multiomix:5.1.2 restart: 'always' # environment: # ENABLE_SECURITY: 'true' diff --git a/src/entrypoint.sh b/src/entrypoint.sh index ba40468d..4b0be2db 100755 --- a/src/entrypoint.sh +++ b/src/entrypoint.sh @@ -21,7 +21,7 @@ echo "##############################################" python3 ${BASE_DIR}/manage.py migrate echo "##############################################" -echo "Running multiomics..." +echo "Running Multiomix..." echo "##############################################" echo ${LISTEN_IP} echo ${LISTEN_PORT} diff --git a/src/entrypoint_celery.sh b/src/entrypoint_celery.sh index 7be9cb17..3692183d 100755 --- a/src/entrypoint_celery.sh +++ b/src/entrypoint_celery.sh @@ -1,4 +1,13 @@ #!/bin/bash -# Starts a celery worker for the specific queue. +DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"multiomics_intermediate.settings"} +echo "##############################################" +echo "Generate key..." +echo "##############################################" +python3 ${BASE_DIR}/manage.py generate_secret_key --settings="${DJANGO_SETTINGS_MODULE}" + +# Starts a celery worker for the specific queue +echo "##############################################" +echo "Running Celery..." +echo "##############################################" python3 -m celery -A multiomics_intermediate worker -l info -Q $QUEUE_NAME --concurrency $CONCURRENCY diff --git a/src/multiomics_intermediate/settings.py b/src/multiomics_intermediate/settings.py index 6aee7662..1f0e2b64 100755 --- a/src/multiomics_intermediate/settings.py +++ b/src/multiomics_intermediate/settings.py @@ -182,7 +182,7 @@ # +++++ Custom settings +++++ # Current Multiomix version -VERSION: str = '5.1.1' +VERSION: str = '5.1.2' # Default primary key field type # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field