6f09d064bd
Use logs instead of attach for builder
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 13:20:02 -07:00
9a82713772
Merge pull request #8578 from erikh/fix_slash
...
builder: Handle trailing \ appropriately.
2014-10-15 12:11:37 -07:00
abec82bdee
Merge pull request #8579 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
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
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
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
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
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
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
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
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
50fa9dffcf
Allow child to overwrite entrypoint from parent
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-07 23:45:35 +00:00
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
7bd482d570
Merge pull request #8370 from duglin/ParserIndent
...
Fix builder/parser so it keeps some whitespace on split lines.
2014-10-06 10:32:02 -07:00
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 #5744 because he had lines ending in &&\
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-10-03 20:33:12 -07:00
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
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
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
670c8696a2
Merge pull request #8284 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
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
1cd6135972
Merge pull request #8230 from duglin/Issue6820
...
add wildcard support to COPY/ADD (part 2 of issue #6820 )
2014-09-29 11:19:01 -07:00
acd40d5079
add wildcard support to copy/add
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-25 20:44:51 -07:00
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
d369612b41
Merge pull request #7994 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
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
81a643211b
Merge pull request #8186 from duglin/ErrInCopyCache
...
Make sure COPY/ADD on dirs doesn't grab too many files
2014-09-23 15:16:57 -07:00
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
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
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
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
05b8a1eb36
Add support for copy/add with multiple src files
...
Part one of solution for issue #6820
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-18 20:12:13 -07:00
f8be5f586f
Merge pull request #8097 from erikh/builder_maintainers
...
Add a new MAINTAINERS file for the builder.
2014-09-17 15:42:34 -07:00
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
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
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
00fd008170
Merge pull request #8062 from vishh/run_in_phase2
...
Add support for 'docker exec' - phase 2
2014-09-16 23:56:12 +04:00
4119c9d7d9
Refactor all pre-compiled regexp to package level vars
...
Addresses #8057
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2014-09-16 12:57:44 -04:00
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
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
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
23f490427f
Merge pull request #7983 from vbatts/vbatts-tarsum_switch_names
...
tarsum: TarSum should be the interface
2014-09-12 17:01:35 -04:00
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
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
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
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
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
6b322ad2d3
builder/parser: fix handling of empty strings as the only argument.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
234f0e4f79
builder/parser/dumper: Handle newlines appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
ec01eb653d
tarsum: TarSum is not the interface
...
don't export the exsisting TarSum struct and call the interface 'TarSum'
instead.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-10 21:56:20 -04:00
747f89cd32
TarSum: versioning
...
This introduces Versions for TarSum checksums.
Fixes: https://github.com/docker/docker/issues/7526
It preserves current functionality and abstracts the interface for
future flexibility of hashing algorithms. As a POC, the VersionDev
Tarsum does not include the mtime in the checksum calculation, and would
solve https://github.com/docker/docker/issues/7387 though this is not a
settled Version is subject to change until a version number is assigned.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-10 15:41:52 -04:00
85314e7e58
Merge pull request #7759 from unclejack/pull_latest_by_default
...
make docker pull only the latest tag by default
2014-09-08 13:43:21 -07:00
f17410da5e
Fix race between dispatchers.run and toDisk
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-04 19:43:28 +04:00
6ba5d67a51
docker build: pull just latest if tag uspecified
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-03 18:32:47 +03:00
4e40d09a2b
Add a progress bar for ADD <url> <dst>
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-09-03 00:17:08 +00:00
f74b901da6
Merge pull request #7839 from LK4D4/embed_state_to_container
...
Use State as embedded to Container
2014-09-02 15:18:32 -07:00
e0339d4b88
Use State as embedded to Container
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-03 00:01:11 +04:00
1858746978
clean up context on build completion & add test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-02 17:35:25 +03:00
a0255ba502
Fix panic when `ENV ARG=ARG` is used.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-31 05:39:36 -07:00
2ef1dec7e8
builder: Refactors according to @tiborvass's comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
305f735080
builder: several fixups from comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
a1522ec01c
builder: move the evaluator package code directly into builder
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
cb51681a6d
builder: Fix handling of ENV references that reference themselves, plus tests.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
1ae4c00a19
builder: fix references to jobs in daemon, make builder a first class
...
package referring to evaluator
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
3dfe5ddfb9
builder: Remove spurious .gitignores
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
248f4c4f75
builder/parser: Rewrite Parse() to use := instead of var
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
135f54ccbf
builder: Remove blankNode(), use &Node{} instead.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
21b15ac920
builder: handle certain classes of JSON errors gracefully
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
4122a981ae
builder: negative test support, fix for shykes's broken dockerfile
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
3f5f6b038f
builder: comments / documentation
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
d6c0bbc3cb
builder: add command handling to evaluator.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:30 -07:00
bb36902db6
builder: rewrote NewBuildFile according to tibor's comments
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:29 -07:00
22c46af4b3
builder: parser and beginnings of the evaluator
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-27 18:52:29 -07:00
57564d91a4
remove empty builder folder
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-15 17:52:44 +00:00
491deae9b8
Move "build" to daemon/build.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 03:12:33 +00:00
aa2d6dbc0c
Inherit Cmd only if no --entrypoint specified on run
...
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-08-04 21:17:37 +04:00
1b6546b840
Cleanup Cmd on ENTRYPOINT instruction
...
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-08-04 20:48:36 +04:00
90dadea84d
Merge pull request #7344 from shykes/cleanup-server-attach
...
Move container-related jobs out of deprecated server/ package
2014-07-31 15:56:48 -07:00
b1496effe3
Merge pull request #7312 from tianon/update-libcontainer
...
Bump libcontainer dep
2014-07-31 15:20:07 -07:00
57b9467f45
Add support for autodetected HOME from USER (if HOME is unset)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-31 12:46:36 -06:00
1219e458d1
utils/tarsum* -> pkg/tarsum
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 06:42:12 -07:00
c2496d97cc
Move Server.ContainerAttach to Daemon.ContainerAttach
...
This is part of an effort to break apart the legacy server package. Help wanted!
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 11:20:31 +00:00
4398108433
Move parsing functions to pkg/parsers and the specific kernel handling
...
functions to pkg/parsers/kernel, and parsing filters to
pkg/parsers/filter. Adjust imports and package references.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-29 13:09:10 -07:00
3a177ccd3a
server/buildfile.go -> builder/builder.go; add maintainers file
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-29 11:35:02 -07:00
Alexandr Morozov
Michael Crosby
Alexandr Morozov
Erik Hollensbe
Tianon Gravi
Lei Jitang
Michael Crosby
Tibor Vass
Victor Vieux
Doug Davis
Joffrey F
Rafe Colton
Andrea Luzzardi
Brian Goff
Oh Jinkyun
Vincent Batts
Phil Estes
Vishnu Kannan
unclejack
Victor Vieux
Jessie Frazelle
Solomon Hykes
Victor Vieux
Michael Crosby