clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 13:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,108 Commits 9 Branches 112 Tags
v1.7.0
Commit Graph
251 Commits
Author SHA1 Message Date
Antonio Murdaca 33588c23c3 Avoid nil pointer dereference while creating a container with an empty Config 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
(cherry picked from commit 4ce817796e)
 2015-06-08 11:39:17 -07:00
Brian Goff f8628ba891 Cleanup container rm funcs 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-26 15:38:52 -04:00
David Calavera 81fa9feb0c Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
unclejack d6a545a989 builder/internals: set up network as bridge 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-05-15 22:58:21 +03:00
Tibor Vass 3985f17812 Merge pull request #13131 from Microsoft/10662-loadonwindows 
Windows: Build load.go
 2015-05-12 18:04:33 -07:00
Antonio Murdaca 6b700bdaca Refactor pkg/stremformatter with custom constructors instead of passing a boolean 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-13 00:09:41 +02:00
John Howard aed8f9f76e Windows: Build load.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-12 14:26:57 -07:00
Alexander Morozov f35038dfba Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12 
Remove API codepaths < 1.12
 2015-05-12 13:08:36 -07:00
Jessie Frazelle 73387bf15a Merge pull request #13105 from duglin/FixRunOutput 
Fix RUN err msg (again)
 2015-05-12 11:36:55 -07:00
Antonio Murdaca 7284b08204 Remove API codepaths < 1.12 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-12 20:09:49 +02:00
Michael Crosby e66ad40c4e Merge pull request #12994 from Microsoft/10662-fixinvocation 
Windows: Fix builder\dispatchers.go
 2015-05-11 11:24:43 -07:00
Doug Davis 006c066b6c Fix RUN err msg (again) 
Previous fix used %q which incorrectly go-escaped things. For example:

```
RUN echoo A \& B	C
```
would result in the user seeing:
```
INFO[0000] The command '/bin/sh -c echoo A \\& B\tC' returned a non-zero code: 127
```
Note the double-\ and the \t instead of a tab character

The testcase had to double escape things due to logrus getting in the way
but I'm going to fix that in another PR because its a change to the UX.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-09 09:22:30 -07:00
Ma Shimiao dccb8b5c33 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-05-09 10:02:46 +08:00
John Howard 4d2f6fbde0 Windows: Fix builder\dispatchers.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-08 11:45:08 -07:00
Jessie Frazelle d0bc0153c6 Merge pull request #12278 from duglin/12267-Wildcards 
Fix for Daemon crashing when wildcards are used for COPY/ADD
 2015-05-07 17:01:16 -07:00
Arnaud Porterie 596e91638c Remove unused Dockerfile instruction INSERT 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-06 16:26:43 -07:00
Doug Davis 54662eae10 Fix RUN's error msg when it fails 
When RUN returns with a non-zero return code it prints the command
that was executed as a Go []string:
```
INFO[0000] The command &{[/bin/sh -c noop a1 a2]} returned a non-zero code: 127
```

instead it should look like this:
```
INFO[0000] The command "/bin/sh -c noop a1 a2" returned a non-zero code: 127
```

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-05 16:08:41 -07:00
Doug Davis 08b7f30fcd 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>
 2015-05-05 15:28:42 -07:00
Arnaud Porterie e960e4bb12 Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
 2015-05-05 14:46:47 -07:00
Arnaud Porterie 9c32cd1cef Merge pull request #10775 from duglin/BuilderFlags 
Add support for Dockerfile CMD options
 2015-05-04 11:39:09 -07:00
Brian Goff d2f0b9ed97 Merge pull request #11190 from cyphar/expose-path-sanitisation-wrappers 
Expose the getResourcePath and getRootResourcePath wrappers.
 2015-04-28 18:45:36 -04:00
Doug Davis a8e871b0bb 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>
 2015-04-28 05:28:46 -07:00
Doug Davis 82daa43844 Fix for Daemon crashing when wildcards are used for COPY/ADD 
in the filename and the command itself

Closes #12267

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-27 19:09:57 -07:00
Phil Estes 0153edcda1 Merge pull request #12828 from tdmackey/trivial-spelling 
trivial: typo cleanup
 2015-04-27 17:05:46 -04:00
David Mackey 3941623fbc trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
 2015-04-27 13:35:08 -07:00
Antonio Murdaca 844538142d Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 21:50:33 +02:00
Antonio Murdaca 26543e0309 Replace json.Unmarshal with json.Decoder().Decode() 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-26 15:02:01 +02:00
Julien Barbier bb41193998 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>
 2015-04-25 15:25:51 -04:00
Alexander Morozov 790c63a5ef Merge pull request #12502 from calavera/shallow_git_history 
Shallow clone using git to build images.
 2015-04-24 10:16:01 -07:00
David Calavera 1cfb307d70 Remove duplicated git clone logic. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:45 -07:00
David Calavera 3117bf3ef5 Test that we set the right arguments for git cloning depending on the transport. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:38 -07:00
David Calavera 9fb7204a41 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:
https://github.com/git/git/commit/4656bf47fca857df51b5d6f4b7b052192b3b2317

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:38 -07:00
David Calavera 36fbf4b864 Shallow clone using git to build images. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:38 -07:00
Aleksa Sarai b7c3c0cb69 *: 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)
 2015-04-25 00:10:29 +10:00
Lei Jitang 5f4fb8be00 Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-24 08:54:08 +08:00
Doug Davis bb9da6ba92 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>
 2015-04-23 10:18:38 -07:00
Alexander Morozov a2f74aa4b4 Remove chain of engine passing from builder to loadManifest 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-21 14:55:23 -07:00
David Calavera ae4063585e Remove engine.Job from builder.CmdBuildConfig. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-20 13:37:06 -07:00
David Calavera 9a2c009751 Remove engine.Job references from builder.CmdBuild 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-20 13:37:04 -07:00
Alexander Morozov 08ef006d17 Merge pull request #12009 from duglin/AddConfig 
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
 2015-04-20 13:12:17 -07:00
Doug Davis 18c9b6c645 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>
 2015-04-20 13:05:24 -07:00
Alexander Morozov a7690076c9 Merge pull request #12453 from runcom/style-minor-fixes 
Add minor stylistic fixes
 2015-04-20 11:51:04 -07:00
Doug Davis b1d8ae3824 Merge pull request #12358 from ZJU-SEL/remove_job_from_tag 
remove job from tag
 2015-04-19 16:02:28 -04:00
Simei He 99f6309b97 remove job from tag 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-19 18:36:56 +08:00
Brian Goff 055c6dbaef Merge pull request #12490 from LK4D4/carry_12396 
remove job from pull and import
 2015-04-17 15:26:30 -04:00
Simei He 6e38a53f96 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>
 2015-04-17 09:55:02 -07:00
Antonio Murdaca 1c89c6ea2f Add minor stylistic fixes 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-16 21:22:32 +02:00
Brian Goff de923f59b3 Merge pull request #12253 from calavera/remove_job_from_start_and_create 
Remove engine.Job from Start and Create
 2015-04-15 21:49:25 -04:00
David Calavera 767df67e31 Decode container configurations into typed structures. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-15 10:22:07 -07:00
Qiang Huang f8dc7e8754 Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:34:12 +08:00