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

Support windows style dockerfile paths for build cmd #11002

Merged
merged 1 commit into from Feb 27, 2015

Conversation

Projects
None yet
6 participants
@ahmetb
Contributor

ahmetb commented Feb 25, 2015

Currently TestBuildRenamedDockerfile fails since passing
custom dockerfile paths like:

docker build -f dir/file .

fails on windows because those are unix paths. Instead, on
windows, accept windows-style paths like:

docker build -f dir\file .

and convert them to unix style paths using the helper we
have in pkg/archive so that daemon can correctly locate
the path in the context. This can fix the test without touching it.

Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
cc: @unclejack @tiborvass @jfrazelle

Support windows style dockerfile paths for build cmd
Currently TestBuildRenamedDockerfile fails since passing
custom dockerfile paths like:

    docker build -f dir/file .

fails on windows because those are unix paths. Instead, on
windows accept windows style paths like:

    docker build -f dir\file .

and convert them to unix style paths using the helper we
have in `pkg/archive` so that daemon can correctly locate
the path in the context.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
@ahmetb

This comment has been minimized.

Contributor

ahmetb commented Feb 25, 2015

https://jenkins.dockerproject.com/job/Windows-PRs/81/console
=== RUN TestBuildRenamedDockerfile
[PASSED]: build - rename dockerfile
--- PASS: TestBuildRenamedDockerfile (3.52s) 👍

@jessfraz

This comment has been minimized.

Contributor

jessfraz commented Feb 25, 2015

LGTM

@ahmetb

This comment has been minimized.

Contributor

ahmetb commented Feb 27, 2015

anyone else?

@duglin

This comment has been minimized.

Contributor

duglin commented Feb 27, 2015

sorry - was distracted this week. LGTM

jessfraz pushed a commit that referenced this pull request Feb 27, 2015

Jessie Frazelle
Merge pull request #11002 from ahmetalpbalkan/win-cli/dockerfile-path…
…-fix

Support windows style dockerfile paths for build cmd

@jessfraz jessfraz merged commit 1061c56 into moby:master Feb 27, 2015

1 of 2 checks passed

windows Jenkins build Windows-PRs 81 has failed
Details
janky Jenkins build Docker-PRs 1788 has succeeded
Details

@ahmetb ahmetb deleted the ahmetb:win-cli/dockerfile-path-fix branch Feb 27, 2015

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