Commit Graph

14 Commits

Author SHA1 Message Date
Jelmer
0ea13d4288
Fix GitLab CI error caused by Docker Compose's platform option (#3585) 2022-02-10 15:06:22 +00:00
Bruno Alla
9e7320ea1b Merge branch 'master' into fix_upgrade_py39
# Conflicts:
#	README.rst
#	{{cookiecutter.project_slug}}/.gitlab-ci.yml
#	{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
#	{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
2021-04-08 18:43:54 +01:00
Tames McTigue
49bf68aa00 Fixed blank space 2021-03-30 13:26:12 +03:00
Tames McTigue
5314faaf8a Fixed placement of image key value for non-Docker run. 2021-03-30 13:09:29 +03:00
areski
a1d551d067 Update from Python3.8 to Python3.9 2021-01-26 16:13:27 +01:00
Arnav Choudhury
7fb71507d2
Updated Gitlab CI to use Python 3.8 instead of Python 3.7 (#2794) 2020-09-07 13:28:49 +01:00
Andrew Chen Wang
d7f22a1158
Changed service to Docker dind 2020-05-29 18:05:44 -04:00
Andrew Chen Wang
7c3558fa62
Fix Docker configuration for Gitlab CI #2549
* Just missing the services I believe according to @rocode?
* I'm hoping to just completely eradicate the need for this setup with a follow-up PR for completely non-Docker approach on CI that supports celery, too.
2020-05-29 17:23:15 -04:00
Andrew-Chen-Wang
d2285d9e2d pytest.parametrized test for generating CI
* Removed celerybeat start's postgres_ready() for new PR for closer inspection and further review. Travis and GitLab CI reflect changes
2020-04-16 13:34:12 -04:00
Andrew Chen Wang
9e007699c9
Merge branch 'master' into ci 2020-04-14 11:55:01 -04:00
Andrew-Chen-Wang
3c63b3e46e Add Docker support to Travis and GitLab CI
* Celerybeat start files wait for table migration so that errors don't occur if a migration does not happen post-build
2020-04-14 11:52:14 -04:00
Gabriel Mejia
2e1a922577
Add CELERY_BROKER_URL for gitlab #2504 (#2505)
* Solved issue #2504

* Added new contributor

Co-authored-by: Gabriel Mejia <gmejia@veritran.com>
2020-03-23 21:43:59 +00:00
Guilherme Guy
fa8311405d Fixes gitlabCI failing due to postgres config 2020-03-15 09:23:21 -03:00
Ivan Khomutov
113ce88d9c Add option to choose CI tool 2019-12-06 10:55:00 +03:00