Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Windows file path#83

Closed
dduportal wants to merge 16 commits intodocker-archive-public:masterfrom
dduportal:windows-file-path
Closed

Windows file path#83
dduportal wants to merge 16 commits intodocker-archive-public:masterfrom
dduportal:windows-file-path

Conversation

@dduportal
Copy link
Copy Markdown
Contributor

@dduportal dduportal commented Dec 11, 2014

Since we got some issues with the path on Windows, @johngossman found the problems and PR'ed on docker (mainly the docker API) :

I pushed the change on all path. occurences, moved to filepath, in order to well-handle all the cases wiith the "" path separator.

It builds, i (quickly) tested on windows 64 and linux 64 inside a centos7 VM.

@dduportal
Moving path to filepath dependency
a6f1200 
Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
@dduportal
Adding filepath imports
f3699f0 
Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
@dduportal dduportal mentioned this pull request Dec 11, 2014
Closed
@bfirsh
Copy link
Copy Markdown
Contributor

bfirsh commented Dec 11, 2014

@dduportal great, thanks! getting test failures though.

jeffmendoza
jeffmendoza reviewed Dec 11, 2014
View reviewed changes
Comment thread store.go Outdated
Copy link
Copy Markdown
Contributor

@jeffmendoza jeffmendoza Dec 11, 2014

Choose a reason for hiding this comment

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

need to use filepath.Join for ".docker" and "hosts" here too

@jeffmendoza
Copy link
Copy Markdown
Contributor

jeffmendoza commented Dec 11, 2014

store_test.go needs it's imports updated to fix tests.

@dduportal
Copy link
Copy Markdown
Contributor Author

dduportal commented Dec 11, 2014

Corrections in progress, i was too quick :)

@dduportal
Fixing test + forgotten imports
8572b74 
Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
@dduportal
Gofmt
dcdedf0 
Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
@dduportal
Copy link
Copy Markdown
Contributor Author

dduportal commented Dec 11, 2014

Test fixed, and some path.Join are fixed.

@bfirsh
Copy link
Copy Markdown
Contributor

bfirsh commented Dec 11, 2014

Great stuff, thanks @dduportal! Could you squash into a single commit?

@johngossman
Copy link
Copy Markdown

johngossman commented Dec 11, 2014

Built and run. Searched for "path." not converted. LGTM

Fix #68. Homedir is now detected same as Docker.
5201904 
Signed-off-by: Jeff Mendoza <jeffmendoza@live.com>
@jeffmendoza jeffmendoza mentioned this pull request Dec 12, 2014
Merged
@bfirsh
Merge pull request #88 from MSOpenTech/homedir
ee98043 
Fix #68. Homedir is now detected same as Docker.
@bfirsh
Remove mitchellh/go-homedir from godeps
ee48b4a 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
@bfirsh
Copy link
Copy Markdown
Contributor

bfirsh commented Dec 12, 2014

Needs a rebase due to #88

bfirsh and others added 9 commits December 12, 2014 01:14
@bfirsh
Merge pull request #87 from ggiamarchi/machine-ls-sort
e12df0c 
Sort `machine ls` output by machine name
@bfirsh
Merge pull request #89 from bfirsh/remove-mitchellh-homedir
e317d7d 
Remove mitchellh/go-homedir from godeps
@dduportal
Correcting filepathes to gain Windows compatibility
ad8431d 
Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
@dduportal
Merge branch 'windows-file-path' of https://github.com/dduportal/machine
31a3496 
 into windows-file-path
@dduportal
# This is a combination of 2 commits.
502bdda 
# The first commit's message is:

Correcting filepathes to gain Windows compatibility

Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>

# This is the 2nd commit message:

Adding filepath imports

Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
@dduportal
Resolving conflict
25fb5a2 
Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
@dduportal
Reapplying filepath after rebasing from master
5036182 
Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
@dduportal
Get rid of / file separators in profit of filepath.Join which is os i…
6c071b6 
…ndependant

Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
@dduportal
Gofmt
e4604d8 
Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
@dduportal
Copy link
Copy Markdown
Contributor Author

dduportal commented Dec 12, 2014

Rebased with conflict merging + re-propagating filepath + join stuff to the rebased version.
Locally, build, tests, and validate* are running ok. Waiting for travis.

I need help with the squash rebase, because when I git rebase -i from the common ancestor, i have to re-run all my previous conflict-rebase work from the issue pull/63. I am probably missing something and i don't want to break the history

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

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dduportal @bfirsh @jeffmendoza @johngossman