p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,316 Commits 2 Branches 295 Tags
ba0c92d010136e401d4441aaecb05a2e4e0bcdcb
Commit Graph

233 Commits

Author SHA1 Message Date
Doug Davis
ba0c92d010 Fix issue where build steps are duplicated in the output 
This fixes an issue where the build output for the "Steps" would look like:
```
Step 1: RUN echo hi echo hi
```
instead of
```
Step 1: RUN echo hi
```

Also, I noticed that there were no checks to make sure invalid Dockerfile
cmd flags were caught on cmds that didn't use cmd flags at all. They would
have been caught on the cmds that had flags, but cmds that didn't bother
to add a new code for flags would have just ignored them.  So, I added
checks to each cmd to flag it.

Added testcases for issues.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 08b7f30fcd050244026098673b19700485308b5a
Component: engine
 2015-05-05 15:28:42 -07:00
Arnaud Porterie
f6876820fd Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
 2015-05-05 14:46:47 -07:00
Arnaud Porterie
3660faa6b0 Merge pull request #10775 from duglin/BuilderFlags 
Add support for Dockerfile CMD options
Upstream-commit: 9c32cd1cef6bd95d6f2a32d18756d6087ad8fa0c
Component: engine
 2015-05-04 11:39:09 -07:00
Brian Goff
12da32d151 Merge pull request #11190 from cyphar/expose-path-sanitisation-wrappers 
Expose the getResourcePath and getRootResourcePath wrappers.
Upstream-commit: d2f0b9ed976987576483387bc919cb7ffbfa38e8
Component: engine
 2015-04-28 18:45:36 -04:00
Doug Davis
d887efe03f Add support for Dockerfile CMD options 
This adds support for Dockerfile commands to have options - e.g:
   COPY --user=john foo /tmp/
   COPY --ignore-mtime foo /tmp/

Supports both booleans and strings.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a8e871b0bbbb63310f372332176875ffcc01aaf6
Component: engine
 2015-04-28 05:28:46 -07:00
Phil Estes
0b5b481a6d Merge pull request #12828 from tdmackey/trivial-spelling 
trivial: typo cleanup
Upstream-commit: 0153edcda1527cd19f5952046b51c4e8358d01ed
Component: engine
 2015-04-27 17:05:46 -04:00
David Mackey
ae74d9f34f trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
Upstream-commit: 3941623fbc3fa724d61f53121513ffd87d03b61c
Component: engine
 2015-04-27 13:35:08 -07:00
Antonio Murdaca
954f940156 Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
 2015-04-27 21:50:33 +02:00
Antonio Murdaca
e5f7f8da6f Replace json.Unmarshal with json.Decoder().Decode() 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 26543e03095eaa45d9afc12c029f07539323fee5
Component: engine
 2015-04-26 15:02:01 +02:00
Julien Barbier
7a068916d5 Happy birthday Docker! cgroup-parent option for docker build. Thanks to Michael, Nathan and Jessie for their support! #42 
Signed-off-by: Julien Barbier <write0@gmail.com>
Upstream-commit: bb411939989dabb56eb604b9a873d1dfbf0646ef
Component: engine
 2015-04-25 15:25:51 -04:00
Alexander Morozov
cc66f7a04e Merge pull request #12502 from calavera/shallow_git_history 
Shallow clone using git to build images.
Upstream-commit: 790c63a5ef34d54ae8ba79886b6c8daae547bf25
Component: engine
 2015-04-24 10:16:01 -07:00
David Calavera
dfd9ef2b64 Remove duplicated git clone logic. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1cfb307d70558110e8e88a7391ae0e6cf6ebf174
Component: engine
 2015-04-24 09:39:45 -07:00
David Calavera
44cdfe63b1 Test that we set the right arguments for git cloning depending on the transport. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3117bf3ef562bc43ef007d8afe3815c58aac6e85
Component: engine
 2015-04-24 09:39:38 -07:00
David Calavera
d5b0b24bb8 Do not try to shallow git history when the protocol doesn't allow it. 
This only happens with the old git http dumb protocol, but that's what we use in our integration tests.
We check the Content-Type header advertised in http requests to make sure the http transport is the git smart transport:

See this commit as a reference:
4656bf47fc

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9fb7204a41804131c2492f9d50d7451e123a05e5
Component: engine
 2015-04-24 09:39:38 -07:00
David Calavera
3c2cab11aa Shallow clone using git to build images. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 36fbf4b86469ca6fe3677d47c9a1976bcdd111e4
Component: engine
 2015-04-24 09:39:38 -07:00
Aleksa Sarai
f124bc620f *: switch to Get(Root)?ResourcePath where appropriate 
Several parts of the codebase didn't use the correct path sanitisation
wrappers. Now that the wrappers have been exposed, use those.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: b7c3c0cb6988c9a7864649bfe458217336c5fc51
Component: engine
 2015-04-25 00:10:29 +10:00
Lei Jitang
734115a06e Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5f4fb8be006c0ffeff2671e5752111e543e07d9f
Component: engine
 2015-04-24 08:54:08 +08:00
Doug Davis
c8f1332dce Move CLI config processing out from under registry dir 
No logic changes should be in here, just moving things around.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: bb9da6ba9294a8eab8f4dfaf7cf07c57959fe608
Component: engine
 2015-04-23 10:18:38 -07:00
Alexander Morozov
43e79cc411 Remove chain of engine passing from builder to loadManifest 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a2f74aa4b449479dc3953b129c839ca90b089494
Component: engine
 2015-04-21 14:55:23 -07:00
David Calavera
16569396d9 Remove engine.Job from builder.CmdBuildConfig. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ae4063585e7936780154101f7fe416a080c6ff7c
Component: engine
 2015-04-20 13:37:06 -07:00
David Calavera
a618f11507 Remove engine.Job references from builder.CmdBuild 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9a2c00975123c17033ac7b50762af82051ec73db
Component: engine
 2015-04-20 13:37:04 -07:00
Alexander Morozov
d6cf7ae01f Merge pull request #12009 from duglin/AddConfig 
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
Upstream-commit: 08ef006d178b7a869c9dfc05c8b887316a856445
Component: engine
 2015-04-20 13:12:17 -07:00
Doug Davis
44c88b9112 Add .docker/config.json and support for HTTP Headers 
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
  but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
  top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
  which adds these http headers to all msgs from the cli

In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 18c9b6c6455f116ae59cde8544413b3d7d294a5e
Component: engine
 2015-04-20 13:05:24 -07:00
Alexander Morozov
6f3b598444 Merge pull request #12453 from runcom/style-minor-fixes 
Add minor stylistic fixes
Upstream-commit: a7690076c955d242b4590fcf557f15e1029d0c8b
Component: engine
 2015-04-20 11:51:04 -07:00
Doug Davis
14bae8f05b Merge pull request #12358 from ZJU-SEL/remove_job_from_tag 
remove job from tag
Upstream-commit: b1d8ae3824d2902c86d63837b8d413952b546d62
Component: engine
 2015-04-19 16:02:28 -04:00
Simei He
dd5f4141fe remove job from tag 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 99f6309b97041bf82cc845340734dc8e47977c8a
Component: engine
 2015-04-19 18:36:56 +08:00
Brian Goff
41c63ff3d3 Merge pull request #12490 from LK4D4/carry_12396 
remove job from pull and import
Upstream-commit: 055c6dbaefc61c597164aaedee4448bc32522b2e
Component: engine
 2015-04-17 15:26:30 -04:00
Simei He
0ff275f7b4 remove job from pull and import 
Closes #12396

Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6e38a53f96403b4cbd38e49e6b294128ed054a20
Component: engine
 2015-04-17 09:55:02 -07:00
Antonio Murdaca
47592700e5 Add minor stylistic fixes 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 1c89c6ea2f34f51a05215279c9cdefca30bb13b1
Component: engine
 2015-04-16 21:22:32 +02:00
Brian Goff
884bdce09a Merge pull request #12253 from calavera/remove_job_from_start_and_create 
Remove engine.Job from Start and Create
Upstream-commit: de923f59b3860eba2c87e8a533b385ac5752243b
Component: engine
 2015-04-15 21:49:25 -04:00
David Calavera
234898b4e7 Decode container configurations into typed structures. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 767df67e3149b83255db0809f6543b449a4f652e
Component: engine
 2015-04-15 10:22:07 -07:00
Qiang Huang
9f222f171d Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f8dc7e8754355c504562021da244c52055ab9204
Component: engine
 2015-04-15 09:34:12 +08:00
Antonio Murdaca
a4111cba55 Refactor utils/utils, fixes #11923 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c30a55f14dbbe3971ba0ac716ba69a60868f4490
Component: engine
 2015-04-14 01:37:36 +02:00
y00277921
b7982a6499 Fix a typo in comment of parseMaybeJSONToList 
Signed-off-by: Yu Changchun <yuchangchun1@huawei.com>
Upstream-commit: 24dd8a4698315a4aafee5071f4fe4d74fa06c377
Component: engine
 2015-04-11 10:34:21 +08:00
David Calavera
95c63c4203 Fix typo in builder/dispatchers.go 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bbdf045ac1dfa8fc78b1c932736fe6400eecdf63
Component: engine
 2015-04-09 11:43:05 -07:00
Alexander Morozov
49e191d0e4 Remove engine usage from attach 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c44f513248a8b40b1b2221726c7441881383e919
Component: engine
 2015-04-07 14:23:09 -07:00
Tibor Vass
088a52cbda Merge pull request #11149 from duglin/8667-AdvancedVars 
Add support for advanced ${} uses
Upstream-commit: 9707286a5cecde3eee3c83e3c2da65df8e59d04e
Component: engine
 2015-04-02 08:25:49 -04:00
Doug Davis
3e035d76a2 Add support for more advanced ${xxx:...} syntax 
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 39908fc6d9a13f0d44196475ba938b6cc352fdbe
Component: engine
 2015-04-01 08:11:15 -07:00
Michael Crosby
753b8ae08c Remove jobs from registry.Service 
This makes `registry.Service` a first class type and does not use jobs
to interact with this type.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 03d3d79b2b3f8b720fff2d649aff0ef791cff417
Component: engine
 2015-03-31 16:38:04 -07:00
Lei Jitang
0544f5e034 Fix error from daemon no such image even when the image exist 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 013fb87543a47524efba3c371a1d22afe151287c
Component: engine
 2015-03-28 09:07:20 +08:00
Antonio Murdaca
e5b36a723c Replace aliased imports of logrus, fixes #11762 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6f4d847046cb4e072de61d042c0266190d73a8c9
Component: engine
 2015-03-26 23:22:04 +01:00
bobby abbott
0ee1e9f604 Fixes hacks from progressreader refactor 
related to #10959

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 0cd6c05d8112e9246b734107d54e2855e3d5fec5
Component: engine
 2015-03-25 18:21:02 -07:00
Antonio Murdaca
a16f3d6cb4 Remove engine.Status and replace it with standard go error 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c79b9bab541673af121d829ebc3b29ff1b01efa2
Component: engine
 2015-03-25 22:32:08 +01:00
Vincent Batts
d4497c7a2b .: remove trailing white spaces 
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 7617ec176d266650b19c2378ccab4aa41e6dc5a2
Component: engine
 2015-03-25 13:38:17 -04:00
Antonio Murdaca
1e47557825 Refactor pkg/common, Fixes #11599 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: b80fae735684406d848b16a0f148a746e17ed25f
Component: engine
 2015-03-24 18:19:59 +01:00
Tibor Vass
925b84807a Merge pull request #11657 from GeorgeMac/cleanup-redundant-else 
#11602 - Cleanup redundant else statements find via golint 
Upstream-commit: 92f9e2d3955fcc3341407809c9db33ac702e1508
Component: engine
 2015-03-23 18:27:29 -05:00
Alexander Morozov
9e396b31ce Merge pull request #11658 from 4gh/doc_package_builder 
Add builder/evaluator comments for the package in godoc-style
Upstream-commit: 9f894c93e40cda8177febe71cd3c17d4b7613659
Component: engine
 2015-03-23 14:27:23 -07:00
Frank Herrmann
835a16cc1d Add builder/evaluator comments for the package in godoc-style 
fixes #11617

Signed-off-by: Frank Herrmann <fgh@4gh.tv>
Upstream-commit: a0cd0045282f21215d7845a987ec6292aa92a685
Component: engine
 2015-03-23 20:56:03 +00:00
George MacRorie
0221549820 Cleanup redundant else statements find via golint #11602 
Signed-off-by: George MacRorie <gmacr31@gmail.com>
Upstream-commit: 664ef0cbe2113e8307135e656cc6db9199f8268e
Component: engine
 2015-03-23 20:40:29 +00:00
Antonio Murdaca
9b9105b3b2 Remove hardcoded error 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 8b02d85e1728b48729b2fb8553b2ec4b56a30d37
Component: engine
 2015-03-23 20:58:16 +01:00