diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2c6593..f990870 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ stages: variables: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" DB_HOST: "postgres" + RABBIT_HOST: "rabbitmq" build: stage: build @@ -34,6 +35,9 @@ deploy-dev: - when: manual variables: PORT: 80 + SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + RABBIT_HOST: "rabbitmq" deploy-prod: extends: @@ -46,3 +50,6 @@ deploy-prod: when: manual variables: PORT: 443 + SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + RABBIT_HOST: "rabbitmq" diff --git a/Sprint/settings.py b/Sprint/settings.py index cdda980..4ea8baa 100644 --- a/Sprint/settings.py +++ b/Sprint/settings.py @@ -140,7 +140,7 @@ for root in DATA_ROOT, EXTRA_FILES_ROOT, MEDIA_ROOT: SOLUTIONS_ROOT = os.path.join(DATA_ROOT, "solutions") -RABBIT_HOST = "rabbitmq" +RABBIT_HOST = os.getenv("RABBIT_HOST", "0.0.0.0") RABBIT_PORT = 5672 STATICFILES_DIRS = [