916cba9c58
builder: internals: fix incomplete chown walk when fixing permissions
...
This patch fixes the permission fixing code used by addContext, which
would not be responsible for Lchown-ing top-level directories added to a
destination that didn't exist prior to untar-ing the context.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
2014-12-12 06:07:16 +11:00
cfc24769a2
Fix permissions on ADD/COPY
...
Fix a regression introduced in PR#9467 when a single file was added or
copied.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-12-10 11:09:03 -08:00
a62cbdeb47
Use Set for stderr "logs" job in builder
...
Because engine implicitly adds his stder to job stderr
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-12-09 19:08:24 -08:00
f3cedce360
Reduce permissions changes scope after ADD/COPY
...
Permissions after an ADD or COPY build instructions are now restricted
to the scope of files potentially modified by the operation rather than
the entire impacted tree.
Fixes #9401 .
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-12-04 17:16:22 -08:00
e6ec703df3
Merge pull request #9323 from unclejack/merge_release_v1.3.2
...
Merge release v1.3.2 to master
2014-11-24 19:26:36 -05:00
5794b5373e
Update code for use of urlutil pkg
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-11-24 18:47:42 -05:00
9c01bc249d
pkg/chrootarchive: pass TarOptions via CLI arg
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Conflicts:
graph/load.go
fixed conflict in imports
2014-11-25 01:03:40 +02:00
1cb17f03d0
add pkg/chrootarchive and use it on the daemon
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Conflicts:
builder/internals.go
daemon/graphdriver/aufs/aufs.go
daemon/volumes.go
fixed conflicts in imports
2014-11-25 01:03:40 +02:00
054e57a622
build: add pull flag to force image pulling
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-11-21 19:59:44 +02:00
1314e1586f
Add support for ENV of the form: ENV name=value ...
...
still supports the old form: ENV name value
Also, fixed an issue with the parser where it would ignore lines
at the end of the Dockerfile that ended with \
Closes #2333
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-20 09:54:28 -08:00
e45b0f9271
Remove unused sysinfo parameter to runconfig.Parse
...
Removing dead code.
Signed-off-by: John Gossman <johngos@microsoft.com>
2014-11-14 18:20:54 -08:00
b4336803f3
Updated cover tool import path.
...
Signed-off-by: Hans Rødtang <hansrodtang@gmail.com>
2014-11-14 06:16:41 +01:00
0b4132782a
Merge pull request #9048 from coaku/b_xzk_rm_redundant_trim
...
Remove redundant stripComment
2014-11-10 21:53:22 -08:00
6c79ee7d1e
Remove the redundant stripComment.
...
Signed-off-by: xuzhaokui <cynicholas@gmail.com>
2014-11-09 23:07:44 +08:00
2e482c86bc
Use the HTTP Last-Modified http header as the mtime value for ADD cmd when present
...
Closes #8331
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-07 13:58:05 -08:00
9cc71b4597
Merge pull request #8468 from laktek/master
...
Fix URL check in build from Git.
2014-10-31 14:43:21 -07:00
24545c18c3
builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-27 21:50:22 +00:00
4e74cd498b
builder: whitelist verbs useful for environment replacement.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-27 17:38:25 +00:00
be49867cab
builder: handle escapes without swallowing all of them.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-27 17:38:24 +00:00
15b6b7be01
Merge pull request #8770 from LK4D4/logrus_support
...
Logrus support
2014-10-27 09:05:24 -07:00
d3ac9ea98e
Add HasValidGITPrefix to utils/utils.go
...
This will allow us to use a common Git prefix check for both api/clients/commands.go and
builder/job.go. Previous prefix check in build from Git (in builder/jobs.go) ignored valid prefixes such as "git@", "http://" or "https://".
Signed-off-by: Lakshan Perera <lakshan@laktek.com>
2014-10-26 03:25:25 +00:00
7c62cee51e
Use logrus everywhere for logging
...
Fixed #8761
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-24 15:03:06 -07:00
cdd6e97910
builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-24 00:23:25 +00:00
bb3e33154d
Merge pull request #8673 from SvenDowideit/whats-docker-version
...
DOCKER_VERSION and docker-version havn't been implemented.
2014-10-22 19:03:54 -07:00
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
6ed610fb80
DOCKER_VERSION and docker-version havn't been implemented.
...
So far, it looks like the declarations are not used, and so its safer not to
confuse people into thinking they do something.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-21 16:04:11 +10:00
b90ab68f2a
Merge pull request #8511 from coolljt0725/fix_tag
...
Fix tag an existed tag name of a repository
2014-10-20 14:32:23 -07:00
75fd1b614d
Merge pull request #8639 from erikh/fix_escapes
...
builder: fix escaping for ENV variables.
2014-10-17 15:50:37 -07:00
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
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
Aleksa Sarai
Arnaud Porterie
Alexandr Morozov
Tibor Vass
Michael Crosby
unclejack
Doug Davis
John Gossman
Hans Rødtang
Erik Hollensbe
xuzhaokui
Jessie Frazelle
Lakshan Perera
Sven Dowideit
Sven Dowideit
Michael Crosby
Alexandr Morozov
Tianon Gravi
Lei Jitang
Victor Vieux
Joffrey F
Rafe Colton