Skip to content
This repository was archived by the owner on Sep 13, 2024. It is now read-only.

Commit b08a81d

Browse files
committed
add 'none' logging driver ECS Agent's config
This commit modifies the `ECS_AVAILABLE_LOGGING_DRIVERS` env var for the Agent to include `none` logging driver. This compliments aws/amazon-ecs-agent#1041 PR in the ECS Agent repository.
1 parent 088670f commit b08a81d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ecs-init/docker/docker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func (c *Client) getContainerConfig() *godocker.Config {
196196
"ECS_AGENT_CONFIG_FILE_PATH": config.AgentJSONConfigFile(),
197197
"ECS_UPDATE_DOWNLOAD_DIR": config.CacheDirectory(),
198198
"ECS_UPDATES_ENABLED": "true",
199-
"ECS_AVAILABLE_LOGGING_DRIVERS": `["json-file","syslog","awslogs"]`,
199+
"ECS_AVAILABLE_LOGGING_DRIVERS": `["json-file","syslog","awslogs","none"]`,
200200
"ECS_ENABLE_TASK_IAM_ROLE": "true",
201201
"ECS_ENABLE_TASK_IAM_ROLE_NETWORK_HOST": "true",
202202
}

ecs-init/docker/docker_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ func validateCommonCreateContainerOptions(opts godocker.CreateContainerOptions,
224224
expectKey("ECS_AGENT_CONFIG_FILE_PATH="+config.AgentJSONConfigFile(), envVariables, t)
225225
expectKey("ECS_UPDATE_DOWNLOAD_DIR="+config.CacheDirectory(), envVariables, t)
226226
expectKey("ECS_UPDATES_ENABLED=true", envVariables, t)
227-
expectKey(`ECS_AVAILABLE_LOGGING_DRIVERS=["json-file","syslog","awslogs"]`, envVariables, t)
227+
expectKey(`ECS_AVAILABLE_LOGGING_DRIVERS=["json-file","syslog","awslogs","none"]`,
228+
envVariables, t)
228229
expectKey("ECS_ENABLE_TASK_IAM_ROLE=true", envVariables, t)
229230
expectKey("ECS_ENABLE_TASK_IAM_ROLE_NETWORK_HOST=true", envVariables, t)
230231
expectKey("ECS_ENABLE_TASK_ENI=true", envVariables, t)

0 commit comments

Comments
 (0)