Commit 43cd7d4c authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix-cf7-default-domain' into 'master' 

Fix: Get actual default domain from api

Closes #21

See merge request to-be-continuous/cloud-foundry!38
parents 217ad4dc 8785a6e6

templates/gitlab-ci-cf.yml

+3 −2
Original line number Diff line number Diff line
@@ -677,8 +677,9 @@ stages: 
  }



  function default_domain() {

    # pick the 1st 'shared' domain that is not 'tcp' or 'internal'

    cf domains | awk '/ shared/ && !/ tcp/ && !/ internal/ {print $1}' | head -n 1 || true

    org_name=$(cf target | awk '/org:/ {print $2}')

    org_guid=$(cf curl "/v3/organizations?names=$org_name" | jq -crM '.resources[0].guid')

    cf curl "/v3/organizations/$org_guid/domains/default" | jq -crM '.name' || true

  }



  function unmap_app_routes() {