Skip to content
Snippets Groups Projects
Commit 981cde5c authored by Roang's avatar Roang
Browse files

Merge branch 'fix/ci-race-condition' into 'develop'

Add job ID to the Django services

See merge request hub/hub!1038
parents f9ec5a74 37bc9910
No related branches found
No related tags found
No related merge requests found
......@@ -61,7 +61,7 @@ default:
- name: postgis/postgis:15-3.3
alias: db_server
variables:
ALLOWED_HOSTS: "127.0.0.1,hubapp"
ALLOWED_HOSTS: "127.0.0.1,hubapp,hubapp-${CI_JOB_ID}"
DJANGO_DEBUG: "I_KNOW_WHAT_I_AM_DOING"
POSTGRES_HOST_AUTH_METHOD: trust
POSTGRES_PASSWORD: runner
......@@ -331,12 +331,12 @@ build_test:
SERVE_API: "no"
SERVE_BACKOFFICE: "no"
SERVE_FRONTEND: "no"
BASE_URL: http://hubapp:8000
BASE_URL: http://hubapp-${CI_JOB_ID}:8000
services:
- name: postgis/postgis:15-3.3
alias: db_server
- name: "$CI_REGISTRY_IMAGE/ci/hub:ci-$CI_PIPELINE_ID-test"
alias: hubapp
alias: hubapp-${CI_JOB_ID}
variables:
DJANGO_CREATE_ADMIN_PASSWORD: "Test1234"
DJANGO_DEBUG: "no"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment