Skip to content

Commit d4ad30a

Browse files
committed
Add 'allow_docker_root_user' config property
1 parent 8da78dd commit d4ad30a

File tree

5 files changed

+5
-0
lines changed

5 files changed

+5
-0
lines changed

config/cloud_controller.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ max_retained_deployments_per_app: 100
6868
max_retained_builds_per_app: 100
6969
max_retained_revisions_per_app: 100
7070
additional_allowed_process_users: ['ContainerUser', 'TestUser']
71+
allow_docker_root_user: true
7172

7273
broker_client_default_async_poll_interval_seconds: 60
7374
broker_client_max_async_poll_duration_minutes: 10080

lib/cloud_controller/config_schemas/api_schema.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class ApiSchema < VCAP::Config
4545
default_health_check_timeout: Integer,
4646
maximum_health_check_timeout: Integer,
4747
additional_allowed_process_users: Array,
48+
allow_docker_root_user: bool,
4849

4950
instance_file_descriptor_limit: Integer,
5051

lib/cloud_controller/config_schemas/clock_schema.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ class ClockSchema < VCAP::Config
188188
max_retained_builds_per_app: Integer,
189189
max_retained_revisions_per_app: Integer,
190190
additional_allowed_process_users: Array,
191+
allow_docker_root_user: bool,
191192

192193
diego_sync: { frequency_in_seconds: Integer },
193194

lib/cloud_controller/config_schemas/deployment_updater_schema.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class DeploymentUpdaterSchema < VCAP::Config
5858
maximum_app_disk_in_mb: Integer,
5959
instance_file_descriptor_limit: Integer,
6060
additional_allowed_process_users: Array,
61+
allow_docker_root_user: bool,
6162

6263
deployment_updater: {
6364
update_frequency_in_seconds: Integer,

lib/cloud_controller/config_schemas/worker_schema.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ class WorkerSchema < VCAP::Config
198198
default_app_log_rate_limit_in_bytes_per_second: Integer,
199199
default_app_ssh_access: bool,
200200
additional_allowed_process_users: Array,
201+
allow_docker_root_user: bool,
201202

202203
jobs: {
203204
global: {

0 commit comments

Comments
 (0)