Skip to content

Windows: Factoring out unused fields#14694

Merged
jessfraz merged 1 commit intomoby:masterfrom
microsoft:10662-apparmorprofile
Jul 28, 2015
Merged

Windows: Factoring out unused fields#14694
jessfraz merged 1 commit intomoby:masterfrom
microsoft:10662-apparmorprofile

Conversation

@lowenna
Copy link
Copy Markdown
Member

@lowenna lowenna commented Jul 16, 2015

@swernli

This PR is part of the proposal described in docker/docker issue 10662 to port the docker daemon to Windows. This PR addresses a lot of "TODO Windows" by refactoring many platform specific fields which were still common across all platforms into the right place. This includes

-- daemon\config: CorsHeaders; EnableCors
-- daemon\container: ResolvConfPath; HostnamePath; HostsPath; UpdateDns; MountPoints; Volumes; VolumesRW
-- daemon\inspect ContainerJSONBase
-- reworking of daemon\create due to above
-- reworking of daemon\volume due to above (there is more to do here, but I'm trying to limit the size of the PR)

@calavera
Copy link
Copy Markdown
Contributor

It looks good at first glance. I don't know if createPlatformSpecific is too abstract.

Comment thread daemon/create_unix.go Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please, don't leave an empty line here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@lowenna
Copy link
Copy Markdown
Member Author

lowenna commented Jul 21, 2015

I was trying to be concise :) But next push will update it to createContainerPlatformSpecificSettings

@lowenna lowenna force-pushed the 10662-apparmorprofile branch 4 times, most recently from b422111 to 0ee8496 Compare July 27, 2015 21:33
@lowenna
Copy link
Copy Markdown
Member Author

lowenna commented Jul 27, 2015

Rebase from hell completed :)

@lowenna lowenna force-pushed the 10662-apparmorprofile branch 2 times, most recently from 076c7d3 to cafc755 Compare July 27, 2015 21:46
@calavera
Copy link
Copy Markdown
Contributor

oh, gosh. I'm very sorry. Changes LGTM.

@jessfraz
Copy link
Copy Markdown
Contributor

:( needs rebasse

@jessfraz
Copy link
Copy Markdown
Contributor

ping me after :)

@lowenna lowenna force-pushed the 10662-apparmorprofile branch from cafc755 to 47c56e4 Compare July 28, 2015 00:44
@lowenna
Copy link
Copy Markdown
Member Author

lowenna commented Jul 28, 2015

Rebased. Waiting for CI to complete.

@jessfraz
Copy link
Copy Markdown
Contributor

ok only seems to be failing on stupid urandom, LGTM, merging

jessfraz pushed a commit that referenced this pull request Jul 28, 2015
Windows: Factoring out unused fields
@jessfraz jessfraz merged commit 4ed3e3a into moby:master Jul 28, 2015
@lowenna lowenna deleted the 10662-apparmorprofile branch July 28, 2015 04:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants