Commit 9b1973d9 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

docs: main or master as prod branch

parent 6217835c

README.md

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ It is only active for your integration branch (`develop` by default). 


### Production environments



Lastly, the template supports 2 environments associated to your production branch (`master` by default):

Lastly, the template supports 2 environments associated to your production branch (`main` or `master` by default):



* a **staging** environment (an iso-prod environment meant for testing and validation purpose),

* the **production** environment.
@@ -146,7 +146,7 @@ Here are variables supported to configure the integration environment: 
#### Staging environment



The staging environment is an iso-prod environment meant for testing and validation purpose associated to your production 

branch (`master` by default).

branch (`main` or `master` by default).



It is **disabled by default** and can be enabled by setting the `CF_STAGING_SPACE` variable (see below).
@@ -168,7 +168,7 @@ Here are variables supported to configure the staging environment: 


#### Production environment



The production environment is the final deployment environment associated with your production branch (`master` by default).

The production environment is the final deployment environment associated with your production branch (`main` or `master` by default).



It is **disabled by default** and can be enabled by setting the `CF_PROD_SPACE` variable (see below).

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ 
    {

      "id": "staging",

      "name": "Staging",

      "description": "An iso-prod environment meant for testing and validation purpose on your production branch (`master` by default)",

      "description": "An iso-prod environment meant for testing and validation purpose on your production branch (`main` or `master` by default)",

      "variables": [

        {

          "name": "CF_STAGING_SPACE",