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.

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

Add Windows configs support #33169

Merged
merged 1 commit into from May 16, 2017

Conversation

@johnstep
Contributor

johnstep commented May 11, 2017

Signed-off-by: John Stephens johnstep@docker.com

This change implements configs support for Windows by writing all configs to a single container directory, mounted at C:\ProgramData\Docker\internal\configs, and creating symlinks from the target to these files.

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah May 12, 2017

Member

ping @jhowardmsft PTAL 😅

Member

thaJeztah commented May 12, 2017

ping @jhowardmsft PTAL 😅

Show outdated Hide outdated daemon/oci_windows.go Outdated
@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah May 15, 2017

Member

@jhowardmsft PR was updated PTAL

Member

thaJeztah commented May 15, 2017

@jhowardmsft PR was updated PTAL

@johnstep

This comment has been minimized.

Show comment
Hide comment
@johnstep

johnstep May 16, 2017

Contributor

This will be rebased, with some manual editing, once #32208 is merged.

Contributor

johnstep commented May 16, 2017

This will be rebased, with some manual editing, once #32208 is merged.

@johnstep

This comment has been minimized.

Show comment
Hide comment
@johnstep

johnstep May 16, 2017

Contributor

Updated and test locally, with and without secrets in the same service.

Contributor

johnstep commented May 16, 2017

Updated and test locally, with and without secrets in the same service.

Add Windows configs support
Signed-off-by: John Stephens <johnstep@docker.com>
// The container file system is mounted before this function is called,
// except for Hyper-V containers, so mount it here in that case.
if isHyperV {
if err := daemon.Mount(c); err != nil {
return nil, err
}
defer daemon.Unmount(c)

This comment has been minimized.

@jhowardmsft

jhowardmsft May 16, 2017

Contributor

👍

@jhowardmsft

jhowardmsft May 16, 2017

Contributor

👍

@jhowardmsft

This comment has been minimized.

Show comment
Hide comment
@jhowardmsft

jhowardmsft May 16, 2017

Contributor

LGTM. Close enough to the secrets PR in terms of change, so most of my previous nits are addressed.

Contributor

jhowardmsft commented May 16, 2017

LGTM. Close enough to the secrets PR in terms of change, so most of my previous nits are addressed.

if err := ioutil.WriteFile(fPath, config.Spec.Data, configRef.File.Mode); err != nil {
return errors.Wrap(err, "error injecting config")
}
}

This comment has been minimized.

@aaronlehmann

aaronlehmann May 16, 2017

Contributor

As a followup, I wonder if this code could be shared with the Linux implementation. It looks very similar.

@aaronlehmann

aaronlehmann May 16, 2017

Contributor

As a followup, I wonder if this code could be shared with the Linux implementation. It looks very similar.

This comment has been minimized.

@johnstep

johnstep May 16, 2017

Contributor

Yes, I think this is worth looking into. The Windows version is essentially a subset, since we do not yet have an equivalent to UID, GID, and mode. It is also similar to setupSecretDir.

@johnstep

johnstep May 16, 2017

Contributor

Yes, I think this is worth looking into. The Windows version is essentially a subset, since we do not yet have an equivalent to UID, GID, and mode. It is also similar to setupSecretDir.

@aaronlehmann

This comment has been minimized.

Show comment
Hide comment
@aaronlehmann

aaronlehmann May 16, 2017

Contributor

LGTM

Contributor

aaronlehmann commented May 16, 2017

LGTM

@johnstep johnstep merged commit 7658851 into moby:master May 16, 2017

6 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 34211 has succeeded
Details
janky Jenkins build Docker-PRs 42811 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 3196 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 14047 has succeeded
Details
z Jenkins build Docker-PRs-s390x 2915 has succeeded
Details

@johnstep johnstep deleted the johnstep:windows-configs branch May 23, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment