Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check domain join based on the gMSA support env #3489

Merged
merged 1 commit into from
Dec 5, 2022
Merged

check domain join based on the gMSA support env #3489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ecs-init/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,13 @@ func (c *client) getContainerConfig(envVarsFromFiles map[string]string) *godocke
envVariables[envKey] = envValue
}

if isDomainJoined() {
// set the environment variable to true if the container instance is domain joined
envVariables["ECS_DOMAIN_JOINED_LINUX_INSTANCE"] = "true"
envVar := os.Getenv(config.ECSGMSASupportEnvVar)
// check for the domain join only if ECS_GMSA_SUPPORTED environment variable is set to true
if envVar == "true" {
if isDomainJoined() {
// set the environment variable to true if the container instance is domain joined
envVariables["ECS_DOMAIN_JOINED_LINUX_INSTANCE"] = "true"
}
}

for key, val := range envVarsFromFiles {
Expand Down