File tree Expand file tree Collapse file tree 8 files changed +20
-0
lines changed
Expand file tree Collapse file tree 8 files changed +20
-0
lines changed Original file line number Diff line number Diff line change @@ -212,6 +212,10 @@ properties:
212212 default: []
213213 description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted."
214214
215+ cc.allow_docker_root_user:
216+ default: true
217+ description: "Whether to allow the use of the 'root' and '0' user for a Process/Task of a docker lifecycle App."
218+
215219 cc.locket.host:
216220 default: "locket.service.cf.internal"
217221 description: "Hostname of the Locket server"
Original file line number Diff line number Diff line change @@ -134,6 +134,7 @@ default_app_disk_in_mb: <%= p("cc.default_app_disk_in_mb") %>
134134maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %>
135135instance_file_descriptor_limit: <%= p("cc.instance_file_descriptor_limit") %>
136136additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %>
137+ allow_docker_root_user: <%= p("cc.allow_docker_root_user") %>
137138
138139deployment_updater:
139140 update_frequency_in_seconds: <%= p("deployment_updater.update_frequency_in_seconds") %>
Original file line number Diff line number Diff line change @@ -426,6 +426,10 @@ properties:
426426 default: []
427427 description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted."
428428
429+ cc.allow_docker_root_user:
430+ default: true
431+ description: "Whether to allow the use of the 'root' and '0' user for a Process/Task of a docker lifecycle App."
432+
429433 cc.newrelic.license_key:
430434 default: ~
431435 description: "The api key for NewRelic"
Original file line number Diff line number Diff line change @@ -73,6 +73,7 @@ max_retained_deployments_per_app: <%= p("cc.max_retained_deployments_per_app") %
7373max_retained_builds_per_app: <%= p("cc.max_retained_builds_per_app") %>
7474max_retained_revisions_per_app: <%= p("cc.max_retained_revisions_per_app") %>
7575additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %>
76+ allow_docker_root_user: <%= p("cc.allow_docker_root_user") %>
7677
7778default_app_log_rate_limit_in_bytes_per_second: <%= p("cc.default_app_log_rate_limit_in_bytes_per_second") %>
7879
Original file line number Diff line number Diff line change @@ -848,6 +848,10 @@ properties:
848848 default: []
849849 description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted."
850850
851+ cc.allow_docker_root_user:
852+ default: true
853+ description: "Whether to allow the use of the 'root' and '0' user for a Process/Task of a docker lifecycle App."
854+
851855 cc.default_app_log_rate_limit_in_bytes_per_second:
852856 default: -1
853857 description: "Default application log rate limit"
Original file line number Diff line number Diff line change @@ -129,6 +129,7 @@ default_app_memory: <%= p("cc.default_app_memory") %>
129129default_app_disk_in_mb: <%= p("cc.default_app_disk_in_mb") %>
130130maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %>
131131additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %>
132+ allow_docker_root_user: <%= p("cc.allow_docker_root_user") %>
132133
133134default_app_log_rate_limit_in_bytes_per_second: <%= p("cc.default_app_log_rate_limit_in_bytes_per_second") %>
134135
Original file line number Diff line number Diff line change @@ -368,6 +368,10 @@ properties:
368368 default: []
369369 description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted."
370370
371+ cc.allow_docker_root_user:
372+ default: true
373+ description: "Whether to allow the use of the 'root' and '0' user for a Process/Task of a docker lifecycle App."
374+
371375 cc.allow_app_ssh_access:
372376 default: true
373377 description: "Allow users to change the value of the app-level allow_ssh attribute"
Original file line number Diff line number Diff line change @@ -64,6 +64,7 @@ default_app_memory: <%= p("cc.default_app_memory") %>
6464default_app_disk_in_mb: <%= p("cc.default_app_disk_in_mb") %>
6565maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %>
6666additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %>
67+ allow_docker_root_user: <%= p("cc.allow_docker_root_user") %>
6768
6869instance_file_descriptor_limit: <%= p("cc.instance_file_descriptor_limit") %>
6970
You can’t perform that action at this time.
0 commit comments