Commit Graph

152 Commits

Author SHA1 Message Date
Michael Crosby 5d9723002b Allow drivers to implement ApplyDiff in Differ interface 2013-11-11 19:09:57 -08:00
Michael Crosby 99141ea3ca Use parent image config in buildfile 2013-11-04 13:20:14 -08:00
Jérôme Petazzoni 31638ab2ad Refactor HostConfig and escape apparmor confinement 2013-11-01 13:55:19 -07:00
Michael Crosby 96d1e9bb5a Move archive.go to sub package 2013-10-31 16:57:45 -07:00
Victor Vieux b2503a72f1 continue build on expose with :, but displays a warning 2013-10-30 11:13:10 -07:00
Michael Crosby 0d2924408b 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.
2013-10-28 18:09:08 -07:00
Michael Crosby 1cbdaebaa1 Add links for container relationships and introspection 2013-10-25 15:13:24 -07:00
Victor Vieux 10e10c9573 fix race condition in docker build with verbose + cleanup hostIntegration debug 2013-10-22 15:01:06 -07:00
Victor Vieux 3acfc60028 change an errorf to a debugf 2013-10-16 19:45:10 +00:00
Solomon Hykes cbc49d7d76 Remove error messages which are not actually errors 2013-10-15 23:12:27 +00:00
Karl Grzeszczak ad723bbfe7 Initial steps to fix Issue #936
Use utils.Errorf instead of utils.Debugf
2013-10-11 08:04:40 -05:00
Sven Dowideit d03022b9ca use empty string so TempDir uses the OS's temp dir automatically (Closes #2117) 2013-10-08 13:24:20 +10:00
Michael Crosby 33972627b7 Merge pull request #1848 from dotcloud/build-clean
Add rm option to docker build to remove intermediate containers
2013-09-13 10:58:59 -07:00
Michael Crosby b7a3fc687e Add rm option to docker build to remove intermediate containers 2013-09-12 16:55:36 +00:00
Michael Crosby 1e723bc95a Replace multiline with empty string not space 2013-09-11 23:43:55 +00:00
Michael Crosby bd0e4fde9a Merge pull request #1838 from jmcvetta/multiline_dockerfile
Implementation of multiline syntax for Dockerfile
2013-09-10 14:22:34 -07:00
Jason McVetta 6a4afb7f8e stricter regexp for Dockerfile line continuations 2013-09-09 18:23:57 -07:00
Jason McVetta 4f3b8033f2 cruft removal 2013-09-09 17:17:09 -07:00
Jason McVetta ebb934c1b0 line continuation regex 2013-09-09 17:02:45 -07:00
Jason McVetta 6921ca4813 read Dockerfile into memory before parsing, to facilitate regexp preprocessing 2013-09-09 16:42:04 -07:00
Victor Vieux 58281b4f18 Merge pull request #1793 from reds/master
From FIXME: local path for ADD
2013-09-09 16:14:59 -07:00
Solomon Hykes 24e02043a2 Merge builder.go into runtime.go 2013-09-06 17:33:05 -07:00
Martin Redmond 8374dac021 From FIXME: local path for ADD 2013-09-05 20:05:36 -04:00
shin- 093b85b72f Use additional decorator in RequestFactory to pass meta headers to registry 2013-08-22 21:15:31 +02:00
Victor Vieux f69c465231 rebase docs 2013-08-20 11:42:53 +00:00
Marco Hennings 319988336c 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.
2013-08-18 20:30:19 +02:00
Victor Vieux 5ee3c58d25 Add USER instruction 2013-08-13 12:02:17 +00:00
Pascal Borreli 9b2a5964fc Fixed typos 2013-08-12 18:53:06 +01:00
Kevin Clark 4ff649a4ea 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.
2013-08-09 14:38:29 -07:00
Guillaume J. Charmes 6a6a2ad8a4
Make sure ENV instruction within build perform a commit each time 2013-08-07 17:23:49 -07:00
Michael Crosby 3104fc8d33 Forbid certain paths within docker build ADD 2013-08-07 16:05:30 +00:00
Victor Vieux 946bbee39a rebase master 2013-08-05 16:25:42 +00:00
Isao Jonas 0f249c85ea fix entrypoint without cmd 2013-08-05 09:07:03 -05:00
Michael Crosby 3a123bc479 Add no cache for docker build
Add a new flag to disable the image cache when building images.
2013-08-02 16:18:54 +00:00
Victor Vieux 46f59dd933 add parallel pull to 1.4 2013-07-30 12:15:33 +00:00
Guillaume J. Charmes f35491190a Merge pull request #1233 from fmd/1136-environment-variables
+ Builder: CmdAdd and CmdEnv now respect Dockerfile-set ENV variables
2013-07-29 13:43:13 -07:00
Guillaume J. Charmes b15cfd3530
- Builder: Create directories with 755 instead of 700 within ADD instruction 2013-07-26 14:57:16 -07:00
Fareed Dudhia d86898b014 Fixes 1136; Reopened from 1175 with latest changes. 2013-07-25 19:45:49 +00:00
Caleb Spare 2b0ebf5d32 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.
2013-07-21 23:32:06 -07:00
Michael Crosby 1104d443cc Revert changes from PR 1030
With streaming output of the build
changes in 1030 are no longer required.
2013-07-11 15:52:08 -09:00
Michael Crosby 474191dd7b Add verbose output to docker build
Verbose output is enabled by default and
the flag -q can be used to suppress the verbose output.
2013-07-11 15:27:33 -09:00
Michael Crosby eb9fef2c42 Add VOLUME instruction to buildfile 2013-07-10 06:59:16 -09:00
Sam Alba 837be914ca Merge branch 'master' of github.com:dotcloud/docker into standalone_registry 2013-07-09 11:31:14 -07:00
Sam Alba 019324015b Moved parseRepositoryTag to the utils package 2013-07-09 08:06:10 -07:00
Sam Alba 3be7bc38e0 Fixed typo (thanks unit tests) 2013-07-08 17:42:18 -07:00
Sam Alba 3e8626c4a1 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) 2013-07-08 17:20:41 -07:00
Guillaume J. Charmes e14dd4d33e Merge pull request #1157 from kstaken/1156-entrypoint-builder
Builder: Fix #1156 entrypoint override from base image
2013-07-08 16:57:26 -07:00
Kimbro Staken f64dbdbe3a Override Entrypoint picked up from the base image that breaks run commands in builder 2013-07-08 16:04:39 -07:00
Victor Vieux 70480ce7bc Merge pull request #1030 from dotcloud/builder_display_err_log
*Builder : Display containers logs in case of build failure
2013-07-08 07:26:46 -07:00
Sam Alba 66a9d06d9f Adding support for nicer URLs to support standalone registry (+ some registry code cleaning) 2013-07-05 12:20:58 -07:00
Michael Crosby b16ff9f859 Add Entrypoint to builder and container config
By setting an entrypoint in the Dockerfile this
allows one to run an image and only pass arguments.
2013-07-01 05:34:27 -09:00
Guillaume J. Charmes 2a20e85203 Improve last log output 2013-06-27 11:10:19 -07:00
Gabriel Monroy 4fdf11b2e6 + Runtime: mount volumes from a host directory with 'docker run -b' 2013-06-26 15:07:31 -07:00
Guillaume J. Charmes 27d6777376 Display containers logs in case of build failure 2013-06-26 12:50:20 -07:00
Solomon Hykes 352991bdf4 Merge branch 'simpler-build-upload' (#900) into builder_server-3 (#848) 2013-06-20 22:02:36 -07:00
Guillaume J. Charmes 659e846006 Merge branch 'master' into builder_server-3
Conflicts:
	docs/sources/use/builder.rst
2013-06-20 10:27:12 -07:00
Solomon Hykes 79efcb545d Merge branch 'master' into simpler-build-upload 2013-06-19 18:48:19 -07:00
Solomon Hykes 5be7b9af3e * Builder: fixed the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented. 2013-06-18 20:28:49 -07:00
Guillaume J. Charmes 34a434616a Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
2013-06-18 16:12:30 -07:00
Solomon Hykes cb9d0fd3bc Nicer output for 'docker build' 2013-06-18 12:26:56 -07:00
Guillaume J. Charmes 555552340d Merge branch 'master' into builder_server-3
Conflicts:
	buildfile_test.go
2013-06-17 14:01:32 -07:00
Solomon Hykes 22b0a38df5 Merge pull request #897 from dotcloud/fix-overlapping-add
* Builder: ADD improvements: use tar for copy + automatically unpack local archives
2013-06-17 13:32:34 -07:00
Solomon Hykes 38554fc2a7 * Builder: simplify the upload of the build context. Simply stream a tarball instead of multipart upload with 4 intermediary buffers. Simpler, less memory usage, less disk usage, and faster. 2013-06-15 09:38:18 -07:00
Solomon Hykes 080f35fe65 Fix a bug which caused builds to fail if ADD was the first command 2013-06-15 09:16:35 -07:00
Solomon Hykes 5b8287617d + Builder: ADD of a local file will detect tar archives and unpack them
into the container instead of copying them as a regular file.

* Builder: ADD uses tar/untar for copies instead of calling 'cp -ar'.
	This is more consistent, reduces the number of dependencies, and
	fixe #896.
2013-06-14 16:43:39 -07:00
Guillaume J. Charmes f03ebc20aa Fix issue with ADD 2013-06-13 18:42:27 -07:00
Guillaume J. Charmes 4b4918f2a7 Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
	commands.go
	docs/sources/api/docker_remote_api.rst
2013-06-13 18:11:22 -07:00
Guillaume J. Charmes 452128f0da Remove run() where it is not needed within the builder 2013-06-13 15:18:15 -07:00
Guillaume J. Charmes f5fe3ce34e Remove run from non-running commmands 2013-06-13 15:08:53 -07:00
Guillaume J. Charmes d0084ce5f2 Remove run from the ADD instruction 2013-06-13 14:57:50 -07:00
Victor Vieux f2383151cb bump to master 2013-06-12 17:39:32 +00:00
Francisco Souza 2e9403b047 build: don't ignore last line in Dockerfile when it doesn't end with \n 2013-06-11 11:39:06 -03:00
Guillaume J. Charmes b103ac70bf Allow multiple tab/spaces between instructions and arguments 2013-06-10 09:31:59 -07:00
Guillaume J. Charmes f4a4cfd2cc Move isUrl to utils.IsURL 2013-06-06 15:50:09 -07:00
Guillaume J. Charmes eaa2183d77 Fix issue EXPOSE override CMD within builder 2013-06-06 15:48:12 -07:00
Guillaume J. Charmes 31d2b258c1 Allow remote url to be passed to the ADD instruction within the builder 2013-06-06 15:40:46 -07:00
Victor Vieux c906239220 bump to master 2013-06-05 10:23:45 +00:00
Victor Vieux fd224ee590 linted names 2013-06-04 18:00:22 +00:00
Victor Vieux 86ada2fa5d drop/omit 2013-06-04 13:51:12 +00:00
Victor Vieux 62c78696cd bump to master 2013-06-03 11:06:13 +00:00
Guillaume J. Charmes 9bc71c101c Merge pull request #719 from dotcloud/json_stream-feature
* API: push, pull, import, insert -> Json Stream
2013-05-31 16:05:15 -07:00
Solomon Hykes caaea2e08f * Build: never remove temporary images and containers 2013-05-30 16:24:26 -07:00
Solomon Hykes c903a6baf8 * Builder: keep temporary images after a build fails, to allow caching 2013-05-30 15:52:09 -07:00
Guillaume J. Charmes 6d2e3d2ec0 Fix issue with CMD instruction within docker build 2013-05-30 12:21:57 -07:00
Guillaume J. Charmes a4e6025cc1 Deprecate INSERT and COPY 2013-05-30 12:10:54 -07:00
Victor Vieux 49e656839f move auth to the client WIP 2013-05-30 15:39:43 +00:00
Solomon Hykes 97247c5c73 'docker build': remove INSERT command (should add support for remote sources in ADD instead) 2013-05-29 21:57:36 -07:00
Guillaume J. Charmes 9a39404127 Fix issue with mkdir within docker build 2013-05-29 18:55:00 -07:00
Solomon Hykes dcab408f6a Fixed phrasing, typos and formatting in 'docker build' 2013-05-29 18:14:50 -07:00
Guillaume J. Charmes faafbf2118 Fix ADD behavior on single files 2013-05-29 17:58:05 -07:00
Guillaume J. Charmes 560a74af15 Fix cache miss issue within docker build 2013-05-29 16:11:04 -07:00
Guillaume J. Charmes b6165daa77 Create a layer for each operation (expose, cmd, etc) 2013-05-29 15:03:00 -07:00
Guillaume J. Charmes ae0d555022 Fix autorun issue within docker build 2013-05-29 14:37:03 -07:00
Guillaume J. Charmes 6cbc7757b2 Fix issue with unknown instruction within docker build 2013-05-29 10:53:24 -07:00
Victor Vieux f339fc2eb9 bump to master 2013-05-29 13:52:18 +00:00
Guillaume J. Charmes 54af053623 Make sure the last line of docker build is the image id 2013-05-28 15:40:22 -07:00
Guillaume J. Charmes 2897cb0476 Add directory contents instead of while directory for docker build 2013-05-28 15:22:01 -07:00
Guillaume J. Charmes cfb8cbe521 Small fix 2013-05-28 13:51:21 -07:00
Guillaume J. Charmes a48799016a Fix merge issue 2013-05-28 13:46:52 -07:00
Guillaume J. Charmes 6ae3800151 Implement the CmdAdd instruction 2013-05-28 13:38:26 -07:00