diff --git a/jobs/cc_deployment_updater/spec b/jobs/cc_deployment_updater/spec index 2b9cc47289..8ea05b6300 100644 --- a/jobs/cc_deployment_updater/spec +++ b/jobs/cc_deployment_updater/spec @@ -212,6 +212,10 @@ properties: default: [] description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted." + cc.allow_docker_root_user: + default: true + description: "Whether to allow the use of the 'root' and '0' user for a Process/Task of a docker lifecycle App." + cc.locket.host: default: "locket.service.cf.internal" description: "Hostname of the Locket server" diff --git a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb b/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb index 5c96e92178..f23e712889 100644 --- a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb +++ b/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb @@ -134,6 +134,7 @@ default_app_disk_in_mb: <%= p("cc.default_app_disk_in_mb") %> maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %> instance_file_descriptor_limit: <%= p("cc.instance_file_descriptor_limit") %> additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %> +allow_docker_root_user: <%= p("cc.allow_docker_root_user") %> deployment_updater: update_frequency_in_seconds: <%= p("deployment_updater.update_frequency_in_seconds") %> diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec index 0d42516f69..0051332e29 100644 --- a/jobs/cloud_controller_clock/spec +++ b/jobs/cloud_controller_clock/spec @@ -426,6 +426,10 @@ properties: default: [] description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted." + cc.allow_docker_root_user: + default: true + description: "Whether to allow the use of the 'root' and '0' user for a Process/Task of a docker lifecycle App." + cc.newrelic.license_key: default: ~ description: "The api key for NewRelic" diff --git a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb index b1030f8ac2..e715cf6cb9 100644 --- a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb @@ -73,6 +73,7 @@ max_retained_deployments_per_app: <%= p("cc.max_retained_deployments_per_app") % max_retained_builds_per_app: <%= p("cc.max_retained_builds_per_app") %> max_retained_revisions_per_app: <%= p("cc.max_retained_revisions_per_app") %> additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %> +allow_docker_root_user: <%= p("cc.allow_docker_root_user") %> default_app_log_rate_limit_in_bytes_per_second: <%= p("cc.default_app_log_rate_limit_in_bytes_per_second") %> diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 993fd983de..edba23a9d5 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -848,6 +848,10 @@ properties: default: [] description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted." + cc.allow_docker_root_user: + default: true + description: "Whether to allow the use of the 'root' and '0' user for a Process/Task of a docker lifecycle App." + cc.default_app_log_rate_limit_in_bytes_per_second: default: -1 description: "Default application log rate limit" diff --git a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb index a8dfdd3f5d..b96d36fa38 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -129,6 +129,7 @@ default_app_memory: <%= p("cc.default_app_memory") %> default_app_disk_in_mb: <%= p("cc.default_app_disk_in_mb") %> maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %> additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %> +allow_docker_root_user: <%= p("cc.allow_docker_root_user") %> default_app_log_rate_limit_in_bytes_per_second: <%= p("cc.default_app_log_rate_limit_in_bytes_per_second") %> diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 9126e8329e..b1a6bcddcf 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -368,6 +368,10 @@ properties: default: [] description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted." + cc.allow_docker_root_user: + default: true + description: "Whether to allow the use of the 'root' and '0' user for a Process/Task of a docker lifecycle App." + cc.allow_app_ssh_access: default: true description: "Allow users to change the value of the app-level allow_ssh attribute" diff --git a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb index 7583a43b37..f73bad3e16 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -64,6 +64,7 @@ default_app_memory: <%= p("cc.default_app_memory") %> default_app_disk_in_mb: <%= p("cc.default_app_disk_in_mb") %> maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %> additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %> +allow_docker_root_user: <%= p("cc.allow_docker_root_user") %> instance_file_descriptor_limit: <%= p("cc.instance_file_descriptor_limit") %>