Skip to content
Snippets Groups Projects
Commit a41acacd authored by m431m's avatar m431m :speech_balloon:
Browse files

Squashed commit of the following:

commit 38646dac
Author: m431m <mmeliani@neogeo.fr>
Date:   Tue Jan 4 10:53:00 2022 +0100

    change schedulers

commit ebda7685
Author: Sébastien DA ROCHA <sebastien@da-rocha.net>
Date:   Tue Jan 4 10:51:12 2022 +0100

    simply celery beat command line

commit 00ec06a4
Author: Sébastien DA ROCHA <sebastien@da-rocha.net>
Date:   Mon Jan 3 19:05:17 2022 +0100

    Add celery beat

commit df925e84
Author: m431m <mmeliani@neogeo.fr>
Date:   Wed Dec 29 17:34:17 2021 +0100

    Add celery beat

commit 4dac4540
Merge: fd73fbd9 92a587e5
Author: m431m <mmeliani@neogeo.fr>
Date:   Wed Dec 29 17:34:06 2021 +0100

    Merge branch 'main' into develop

commit fd73fbd9
Author: Kevin Rakotobe <krakotobe@neogeo.fr>
Date:   Fri Dec 17 14:10:00 2021 +0000

    timeout 300 to 1800

commit f230390a
Author: m431m <mmeliani@neogeo.fr>
Date:   Thu Dec 9 16:24:41 2021 +0100

    revert 233b3bda

commit 83719d8d
Merge: 7460b308 e25489f7
Author: m431m <mmeliani@neogeo.fr>
Date:   Thu Dec 9 16:11:43 2021 +0100

    Merge branch 'main' into develop

commit 7460b308
Author: Kevin Rakotobe <krakotobe@neogeo.fr>
Date:   Mon Nov 22 09:04:01 2021 +0000

    Update start.sh

commit a5a0a863
Merge: 6fdd07b5 67bb7733
Author: m431m <mmeliani@neogeo.fr>
Date:   Thu Nov 18 10:50:10 2021 +0100

    Merge branch 'main' into develop

commit 6fdd07b5
Author: m431m <mmeliani@neogeo.fr>
Date:   Thu Nov 18 09:47:26 2021 +0000

    Comment 'migrate'  and add  opt '--locale=fr' to compilemessages cmd

commit 88901946
Merge: bb925542 f41562ce
Author: m431m <mmeliani@neogeo.fr>
Date:   Thu Nov 18 09:29:45 2021 +0100

    Merge branch 'main' into develop

commit bb925542
Author: Kevin Rakotobe <krakotobe@neogeo.fr>
Date:   Wed Nov 17 11:15:21 2021 +0000

    Update start.sh

commit e2f7ba3c
Merge: f96059d9 97021bd2
Author: m431m <mmeliani@neogeo.fr>
Date:   Tue Nov 9 09:54:53 2021 +0100

    Merge branch 'main' into develop

commit f96059d9
Author: m431m <mmeliani@neogeo.fr>
Date:   Thu Oct 28 11:12:17 2021 +0200

    1.0.0b3->develop

commit cd4d7af7
Merge: e4309275 9cd6ef7a
Author: m431m <mmeliani@neogeo.fr>
Date:   Thu Oct 28 11:09:25 2021 +0200

    Merge branch 'main' into develop

commit e4309275
Author: m431m <mmeliani@neogeo.fr>
Date:   Thu Oct 28 11:04:42 2021 +0200

    Update to ~1.0.0b3

commit 7570163a
Merge: a3245daa 76d2252f
Author: m431m <mmeliani@neogeo.fr>
Date:   Fri Oct 22 17:44:26 2021 +0200

    Merge branch 'main' into develop

commit a3245daa
Author: m431m <mmeliani@neogeo.fr>
Date:   Fri Oct 22 17:43:01 2021 +0200

    Update to ~1.0.0b2
parent 4a523cb8
No related branches found
No related tags found
No related merge requests found
version: '2.4'
services:
onegeo-suite:
onegeo-suite: &onegeo-suite
image: neogeo/onegeo-suite:testing
build: .
volumes:
......@@ -16,17 +16,14 @@ services:
cpu_count: 1
onegeo-suite-worker:
image: neogeo/onegeo-suite:testing
build: .
<<: *onegeo-suite
command: src/docker/start-celery.sh
volumes:
- onegeo:/home/apprunner/onegeo_app/media
env_file:
- env
restart: always
mem_limit: 1g
mem_reservation: 512m
cpu_count: 1
ports: []
onegeo-suite-beat:
<<: *onegeo-suite
command: src/docker/start-celery-beat.sh
ports: []
redis:
image: redis
......
......@@ -41,8 +41,8 @@ else
echo "[${DB_HOST}] The database server is ready."
break
fi
echo "[Retry: $i] The database server is not ready. Next attempt in ${TIME_SLEEP}s"
sleep $TIME_SLEEP
echo "[Retry: $i] The database server is not ready. Next attempt in ${TIME_SLEEP:-1}s"
sleep ${TIME_SLEEP:-1}
((i++))
done
......
......@@ -243,6 +243,7 @@ ONEGEOSUITE_CELERY_TASK_PROTOCOL = 1
ONEGEOSUITE_CELERY_TASK_SERIALIZER = 'pickle'
ONEGEOSUITE_CELERY_RESULT_SERIALIZER = 'pickle'
ONEGEOSUITE_CELERY_TIMEZONE = TIME_ZONE
ONEGEOSUITE_CELERY_BEAT_SCHEDULER = 'onegeo_suite.schedulers.DatabaseScheduler'
ONEGEOSUITE_CELERY_BEAT_SCHEDULER = 'django_celery_beat.schedulers.DatabaseScheduler'
......
#!/bin/bash
echo "Step 01. starting celery"
exec celery --app=onegeo_suite beat -l INFO
# IMPORTANT: elasticsearch 7.14 ne marche pas avec un elasticsearch OSS
elasticsearch==7.13.0
-e git+https://docker-onegeo-suite:D7S9gajfakqgzRwsAxB4@git.neogeo.fr/onegeo-suite/apps/django-onegeo-suite.git@1.0.0b11#egg=django_onegeo_suite
-e git+https://docker-onegeo-suite:D7S9gajfakqgzRwsAxB4@git.neogeo.fr/onegeo-suite/apps/django-onegeo-suite.git@1.0.0b12#egg=django_onegeo_suite
-e git+https://github.com/danpoland/drf-reverse-proxy@master#egg=drf-reverse-proxy
python-decouple
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment