kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
11209 commits 10 branches 356 tags 299 MiB
Commit graph

87 commits

Author SHA1 Message Date
Erik Hollensbe
a34831f016 builder: handle cases where onbuild is not uppercase. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-21 20:17:37 +00:00
Michael Crosby
b90ab68f2a Merge pull request from coolljt0725/fix_tag 
Fix tag an existed tag name of a repository
 2014-10-20 14:32:23 -07:00
Alexandr Morozov
75fd1b614d Merge pull request from erikh/fix_escapes 
builder: fix escaping for ENV variables.
 2014-10-17 15:50:37 -07:00
Erik Hollensbe
df0e0c7683 builder: fix escaping for ENV variables. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-17 21:47:35 +00:00
Alexandr Morozov
6f09d064bd Use logs instead of attach for builder 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 13:20:02 -07:00
Michael Crosby
9a82713772 Merge pull request from erikh/fix_slash 
builder: Handle trailing \ appropriately.
 2014-10-15 12:11:37 -07:00
Alexandr Morozov
abec82bdee Merge pull request from erikh/builder_html_panic 
builder: handle anything we cannot parse the command for as a fatal error
 2014-10-15 12:01:52 -07:00
Erik Hollensbe
3f2eb353bd builder: provide a friendly message on parser errors 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 18:08:23 +00:00
Erik Hollensbe
63637b9d27 builder: handle anything we cannot parse the command for as a fatal error. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 08:47:15 +00:00
Erik Hollensbe
96f342f703 builder: comments should also be elided in the middle of statements following a line continuation. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 08:44:14 +00:00
Erik Hollensbe
a1ef2207dd builder: strip blank lines before processing any line continuations. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 04:00:17 +00:00
Erik Hollensbe
7fa449191c builder: Handle trailing \ appropriately. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 03:08:18 +00:00
Tianon Gravi
24189b2c36 Fix builder from being over-aggressive on ${} 
`${SOME_VAR%pattern}` was turning into `SOME_VAL%pattern}` which the shell would then balk at.

I've updated the `TOKEN_ENV_INTERPOLATION` regex to account for this (ie, if `${` is used, it _must_ also match the closing `}`), and renamed the variable to not be exported (since it's not used outside the function following it).

I also added comments for the bits of `tokenEnvInterpolation` so they're easier to follow. 😄

Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-10-14 00:58:55 -06:00
Erik Hollensbe
1150c1639a builder: ONBUILD triggers were not accurately being executed in JSON cases. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-14 01:59:45 +00:00
Lei Jitang
5e6f16e342 Fix the bug of tag a existed tag name of a repository. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2014-10-10 09:18:12 +08:00
Michael Crosby
50fa9dffcf Allow child to overwrite entrypoint from parent 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-07 23:45:35 +00:00
Tibor Vass
0a2c481c7f ignore invalid Dockerfile instructions and do not consider "docker-version" a Dockerfile instruction 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-06 23:26:59 -04:00
Victor Vieux
7bd482d570 Merge pull request from duglin/ParserIndent 
Fix builder/parser so it keeps some whitespace on split lines.
 2014-10-06 10:32:02 -07:00
Doug Davis
f440c6b224 Fix builder/parser so it keeps some whitespace on split lines. 
If previous line ends with whitespace, or next line starts with whitepsace
we need to preserve a space otherwise things line:
RUN echo\
   hello
will appear as: RUN echohello

Noticed this while looking at  because he had lines ending in &&\

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-10-03 20:33:12 -07:00
Joffrey F
aabba9801a Added validity checks for repo name and tag in build job. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2014-10-02 17:37:13 +02:00
Rafe Colton
30d5a42c1f Move archive package into pkg/archive 
Now that the archive package does not depend on any docker-specific
packages, only those in pkg and vendor, it can be safely moved into pkg.

Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
 2014-09-29 23:23:36 -07:00
Rafe Colton
b845a62149 Move Go() promise-like func from utils to pkg/promise 
This is the first of two steps to break the archive package's dependence
on utils so that archive may be moved into pkg.  Also, the `Go()`
function is small, concise, and not specific to the docker internals, so
it is a good candidate for pkg.

Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
 2014-09-29 23:16:27 -07:00
Tibor Vass
670c8696a2 Merge pull request from erikh/fix_cmd_again 
builder: Fix CMD to inject /bin/sh -c when provided with a non-json value
 2014-09-29 15:56:16 -04:00
Erik Hollensbe
9f142bf9be builder: Fix CMD to inject /bin/sh -c when provided with a non-json value. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-29 12:22:18 -07:00
Erik Hollensbe
1cd6135972 Merge pull request from duglin/Issue6820 
add wildcard support to COPY/ADD (part 2 of issue )
 2014-09-29 11:19:01 -07:00
Doug Davis
acd40d5079 add wildcard support to copy/add 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-25 20:44:51 -07:00
Andrea Luzzardi
1df87b9506 API: Provide the HostConfig during "run". 
Currently, the HostConfig is only passed from the CLI to Docker only
when issuing a docker create, but not when doing a docker run.

In the near future, in order to allocate ports at creation time rather
than start time, we will need to have the HostConfig readily available
at container creation.

This PR makes the client always pass the HostConfig when creating a
container (regardless of whether it's for a run or create).

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2014-09-25 15:24:38 -07:00
Tibor Vass
d369612b41 Merge pull request from erikh/parser_fix_volume_parsing 
builder: Fix handling of VOLUME command where multiple volumes are specified in a space delimited list.
 2014-09-25 12:45:48 -04:00
Erik Hollensbe
a5ca549a18 builder: Fix handling of VOLUME command where multiple volumes are 
specified in a space delimited list.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-25 09:44:19 -07:00
Victor Vieux
81a643211b Merge pull request from duglin/ErrInCopyCache 
Make sure COPY/ADD on dirs doesn't grab too many files
 2014-09-23 15:16:57 -07:00
Doug Davis
cd329d062b Make sure COPY/ADD on dirs doesn't grab too many files 
Add check for / first - per LK4D4's comment.
Add a comment to explain why we're adding a /

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-23 14:16:00 -07:00
Erik Hollensbe
8edacc673a builder: properly communicate onbuild trigger information during 
subsequent builds.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-23 13:55:51 -07:00
Erik Hollensbe
1e93639aed builder: Appropriately initialize the Cmd in runconfig. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-22 23:10:05 -07:00
Brian Goff
45407cf00a Split volumes out from daemon 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-09-19 17:47:47 -05:00
Doug Davis
05b8a1eb36 Add support for copy/add with multiple src files 
Part one of solution for issue 

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-18 20:12:13 -07:00
Michael Crosby
f8be5f586f Merge pull request from erikh/builder_maintainers 
Add a new MAINTAINERS file for the builder.
 2014-09-17 15:42:34 -07:00
Erik Hollensbe
1ff1befd12 Add a new MAINTAINERS file for the builder. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-17 15:36:04 -07:00
Oh Jinkyun
9aa71549d6 Removed runconfig.ParseSubcommand 
Removed runconfig.ParseSubcommand, changed it to runconfig.Parse and editted related tests and modules

Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
 2014-09-17 14:38:22 -07:00
Vincent Batts
c5e6362c53 tarsum: name collision fix 
If a tar were constructed with duplicate file names, then depending on
the order, it could result in same tarsum.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-09-17 14:37:46 -04:00
Alexandr Morozov
00fd008170 Merge pull request from vishh/run_in_phase2 
Add support for 'docker exec' - phase 2
 2014-09-16 23:56:12 +04:00
Phil Estes
4119c9d7d9 Refactor all pre-compiled regexp to package level vars 
Addresses 

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2014-09-16 12:57:44 -04:00
Vishnu Kannan
5130fe5d38 Adding support for docker exec in daemon. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:57:52 +00:00
Vishnu Kannan
f3c767d798 Adding Exec method to native execdriver. 
Modified Attach() method to support docker exec.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:57:52 +00:00
unclejack
31c0039022 clean up the context when a build fails 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-15 16:01:23 +03:00
Tibor Vass
23f490427f Merge pull request from vbatts/vbatts-tarsum_switch_names 
tarsum: TarSum should be the interface
 2014-09-12 17:01:35 -04:00
Erik Hollensbe
91bed43621 builder: Fix an error check being done at the wrong spot in run 
dispatcher

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
92f885d7bd Do not populate path to prevent runconfig merge conflict; remove 
autoConfig seeding of entrypoint.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
78a847a47a evaluator: ensure entrypoint stays blank if set blank while CMD is set. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
ac107995ae builder: Fix entrypoint and cmd semantics in evaluator. Test c/o @cnf 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
3a6d1228a8 builder: Fix a small bug that could improperly cache. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-11 06:00:24 -07:00