Solomon Hykes
542c84c74e
Merge branch 'master' into 0.6.5-dm-plugin
...
Upstream-commit: 43c7df946d56a9d9d0e0b7226042a0dd6a58a17b
Component: engine
2013-11-26 02:00:25 +00:00
Guillaume J. Charmes
63cc3164f1
Remove useless New*Opt functions, singleline Opt types
...
Upstream-commit: c67f9b671df024d06b0af0a0eaa02058e69ee9f5
Component: engine
2013-11-22 14:42:30 -08:00
Michael Crosby
084cb15f1a
Allow drivers to implement ApplyDiff in Differ interface
...
Upstream-commit: 5d9723002bc764e2c768e5184994d7949f55fc49
Component: engine
2013-11-11 19:09:57 -08:00
Michael Crosby
33ea8b01c4
Use parent image config in buildfile
...
Upstream-commit: 99141ea3ca3c0429ecdfc3bdb097a68957beab71
Component: engine
2013-11-04 13:20:14 -08:00
Jérôme Petazzoni
5e4f415366
Refactor HostConfig and escape apparmor confinement
...
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
Michael Crosby
fb9771da9e
Move archive.go to sub package
...
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
2013-10-31 16:57:45 -07:00
Victor Vieux
d2b1922a6b
continue build on expose with :, but displays a warning
...
Upstream-commit: b2503a72f1f1db887fd11199036f05efe3d35992
Component: engine
2013-10-30 11:13:10 -07:00
Michael Crosby
7ce1e20657
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
Michael Crosby
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
Victor Vieux
d8ab9dfa35
fix race condition in docker build with verbose + cleanup hostIntegration debug
...
Upstream-commit: 10e10c9573a0f20243212192fa782feb35651b18
Component: engine
2013-10-22 15:01:06 -07:00
Victor Vieux
9ff0513e0d
change an errorf to a debugf
...
Upstream-commit: 3acfc600285dedd2e10a3780e041af0cc39675a7
Component: engine
2013-10-16 19:45:10 +00:00
Solomon Hykes
8c6c389ec3
Remove error messages which are not actually errors
...
Upstream-commit: cbc49d7d76dfc9e259d5227a0077a83e5faf1202
Component: engine
2013-10-15 23:12:27 +00:00
Karl Grzeszczak
b2ba4dc1a1
Initial steps to fix Issue #936
...
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
2013-10-11 08:04:40 -05:00
Sven Dowideit
4878575100
use empty string so TempDir uses the OS's temp dir automatically ( Closes #2117 )
...
Upstream-commit: d03022b9ca5e658e551ab3b9907da946b11a0b4c
Component: engine
2013-10-08 13:24:20 +10:00
Michael Crosby
4de754b9f6
Merge pull request #1848 from dotcloud/build-clean
...
Add rm option to docker build to remove intermediate containers
Upstream-commit: 33972627b7feb7bddce87e92d3789de6eb4611ef
Component: engine
2013-09-13 10:58:59 -07:00
Michael Crosby
efc88e6663
Add rm option to docker build to remove intermediate containers
...
Upstream-commit: b7a3fc687ec55b68ee0cadf78d7f1eff3e531fbd
Component: engine
2013-09-12 16:55:36 +00:00
Michael Crosby
ec20b18bca
Replace multiline with empty string not space
...
Upstream-commit: 1e723bc95a61fb6c46af82557c128d1e95a33a99
Component: engine
2013-09-11 23:43:55 +00:00
Michael Crosby
97c0d31d6a
Merge pull request #1838 from jmcvetta/multiline_dockerfile
...
Implementation of multiline syntax for Dockerfile
Upstream-commit: bd0e4fde9a2a1fb1f676e7ea19e111be46cb87c8
Component: engine
2013-09-10 14:22:34 -07:00
Jason McVetta
867da1f571
stricter regexp for Dockerfile line continuations
...
Upstream-commit: 6a4afb7f8eacde9cb81202347258983908a9f7c6
Component: engine
2013-09-09 18:23:57 -07:00
Jason McVetta
40bf9b7fa6
cruft removal
...
Upstream-commit: 4f3b8033f287051156e6b81aeff9da3c44f64cba
Component: engine
2013-09-09 17:17:09 -07:00
Jason McVetta
58dbcaf56e
line continuation regex
...
Upstream-commit: ebb934c1b044f4bbffe312e9c88c00134c94ef7f
Component: engine
2013-09-09 17:02:45 -07:00
Jason McVetta
f94f2fe1fc
read Dockerfile into memory before parsing, to facilitate regexp preprocessing
...
Upstream-commit: 6921ca4813a583948d3871a53d0349b834f31036
Component: engine
2013-09-09 16:42:04 -07:00
Victor Vieux
9a252c6ee5
Merge pull request #1793 from reds/master
...
From FIXME: local path for ADD
Upstream-commit: 58281b4f18b01b06f49e9ca90e39c918bfc3275b
Component: engine
2013-09-09 16:14:59 -07:00
Solomon Hykes
aa0ad01db6
Merge builder.go into runtime.go
...
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
2013-09-06 17:33:05 -07:00
Martin Redmond
73b7802f1f
From FIXME: local path for ADD
...
Upstream-commit: 8374dac02141c1409b93bb3838f6dabbba4d5b14
Component: engine
2013-09-05 20:05:36 -04:00
shin-
5443b4f352
Use additional decorator in RequestFactory to pass meta headers to registry
...
Upstream-commit: 093b85b72f7a0fcda292816716e795543b3a72eb
Component: engine
2013-08-22 21:15:31 +02:00
Victor Vieux
ac774c5f65
rebase docs
...
Upstream-commit: f69c4652314064a2e676220ef8e137e8499ce3b8
Component: engine
2013-08-20 11:42:53 +00:00
Marco Hennings
0c286d916a
Add workdir support for the Buildfile
...
For consistency the Buildfile should have the option to
set the working directory.
Of course that is one option more to the buildfile,
so please tell me if we really want this to happen.
Upstream-commit: 319988336ceed4428de0e1e55685f8a0ed48a7bd
Component: engine
2013-08-18 20:30:19 +02:00
Victor Vieux
9540169e17
Add USER instruction
...
Upstream-commit: 5ee3c58d2549c25fa4464963831a28a99407b6cd
Component: engine
2013-08-13 12:02:17 +00:00
Pascal Borreli
efc4a51c0c
Fixed typos
...
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
Kevin Clark
4b414aab13
Only count known instructions as build steps
...
stepN is only used in the log line, so if we only produce the log line
when there's a message, it should do the right thing.
If it's *not* a valid instruction, it gets a line as well, so there's no
reason to double up.
Upstream-commit: 4ff649a4eaf5c653176d2fecbfdb6571f0d0d174
Component: engine
2013-08-09 14:38:29 -07:00
Guillaume J. Charmes
c2560e21bf
Make sure ENV instruction within build perform a commit each time
...
Upstream-commit: 6a6a2ad8a4af85b543a24c5d22a2be5fdfc252d6
Component: engine
2013-08-07 17:23:49 -07:00
Michael Crosby
fa6b9b59de
Forbid certain paths within docker build ADD
...
Upstream-commit: 3104fc8d33ce4c26a446826639a7b2dba524264f
Component: engine
2013-08-07 16:05:30 +00:00
Victor Vieux
d457571635
rebase master
...
Upstream-commit: 946bbee39a33b229b9da39e0f2062d43dde8dcee
Component: engine
2013-08-05 16:25:42 +00:00
Isao Jonas
fe0fe92945
fix entrypoint without cmd
...
Upstream-commit: 0f249c85ea9acc7fba33994aa5d20a897463db2c
Component: engine
2013-08-05 09:07:03 -05:00
Michael Crosby
ac12d9b409
Add no cache for docker build
...
Add a new flag to disable the image cache when building images.
Upstream-commit: 3a123bc479457c4dfa14e39b7c42d9a9dccf8c32
Component: engine
2013-08-02 16:18:54 +00:00
Victor Vieux
d2c440fbc7
add parallel pull to 1.4
...
Upstream-commit: 46f59dd9333baa578b184eb25b386ac2f41caf04
Component: engine
2013-07-30 12:15:33 +00:00
Guillaume J. Charmes
0864f56735
Merge pull request #1233 from fmd/1136-environment-variables
...
+ Builder: CmdAdd and CmdEnv now respect Dockerfile-set ENV variables
Upstream-commit: f35491190a91fb078cb1e5b3319434a6acfa024e
Component: engine
2013-07-29 13:43:13 -07:00
Guillaume J. Charmes
bdd8af7919
- Builder: Create directories with 755 instead of 700 within ADD instruction
...
Upstream-commit: b15cfd3530cc228dc065746c9323758c8abb0481
Component: engine
2013-07-26 14:57:16 -07:00
Fareed Dudhia
7c51899dd5
Fixes 1136; Reopened from 1175 with latest changes.
...
Upstream-commit: d86898b0142f2f9a834aa0c727b10d62ef647262
Component: engine
2013-07-25 19:45:49 +00:00
Caleb Spare
adbaef1554
Buildfile: for ADD command, determine filename from URL.
...
This is used if the destination is a directory. This makes the URL
download behavior more closely match file copying.
Fixes #1142 .
Upstream-commit: 2b0ebf5d32c65276ce50fce168f32483ffb9c311
Component: engine
2013-07-21 23:32:06 -07:00
Michael Crosby
89646a08c9
Revert changes from PR 1030
...
With streaming output of the build
changes in 1030 are no longer required.
Upstream-commit: 1104d443cc49fd2a6b9c94a2c9724468f9860799
Component: engine
2013-07-11 15:52:08 -09:00
Michael Crosby
015f243412
Add verbose output to docker build
...
Verbose output is enabled by default and
the flag -q can be used to suppress the verbose output.
Upstream-commit: 474191dd7bca9eedaccb9de1771eecfce7dfebbb
Component: engine
2013-07-11 15:27:33 -09:00
Michael Crosby
7935041f18
Add VOLUME instruction to buildfile
...
Upstream-commit: eb9fef2c424178277cacd29d404cc8e774bb3891
Component: engine
2013-07-10 06:59:16 -09:00
Sam Alba
9f779bc589
Merge branch 'master' of github.com:dotcloud/docker into standalone_registry
...
Upstream-commit: 837be914ca96c1f03d835a7b834693be16ce7043
Component: engine
2013-07-09 11:31:14 -07:00
Sam Alba
13a18e3d5d
Moved parseRepositoryTag to the utils package
...
Upstream-commit: 019324015b0c64733ae4f39708aa49a08134cb48
Component: engine
2013-07-09 08:06:10 -07:00
Sam Alba
003e7619de
Fixed typo (thanks unit tests)
...
Upstream-commit: 3be7bc38e034c94da7cd6da5f2e5ecffd1832d6b
Component: engine
2013-07-08 17:42:18 -07:00
Sam Alba
a1649836a4
Changed the tag parsing to it will work even if there is a port in the repos registry url (full qualified name for pushing on a standalone registry)
...
Upstream-commit: 3e8626c4a171653971aebcb778087c89c6c7ab67
Component: engine
2013-07-08 17:20:41 -07:00
Guillaume J. Charmes
7664005559
Merge pull request #1157 from kstaken/1156-entrypoint-builder
...
Builder: Fix #1156 entrypoint override from base image
Upstream-commit: e14dd4d33e2bbdb54f2bac31eb8eae155f9b656a
Component: engine
2013-07-08 16:57:26 -07:00
Kimbro Staken
f371bd9fe8
Override Entrypoint picked up from the base image that breaks run commands in builder
...
Upstream-commit: f64dbdbe3a147f58d04b6c39c6469fdd97427098
Component: engine
2013-07-08 16:04:39 -07:00