1
0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Commit Graph

79 Commits

Author SHA1 Message Date
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
Victor Vieux
ed7082a0e1 Merge pull request #1030 from dotcloud/builder_display_err_log
*Builder : Display containers logs in case of build failure
Upstream-commit: 70480ce7bc6991efd7fa917981940a0c1321eb17
Component: engine
2013-07-08 07:26:46 -07:00
Sam Alba
057f0a4b6f Adding support for nicer URLs to support standalone registry (+ some registry code cleaning)
Upstream-commit: 66a9d06d9fa7a382c6852cf047e1448e0d3e1782
Component: engine
2013-07-05 12:20:58 -07:00
Michael Crosby
2e70c0f0f0 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.
Upstream-commit: b16ff9f8598d30823f687d100d351cad11823e77
Component: engine
2013-07-01 05:34:27 -09:00
Guillaume J. Charmes
d68905c249 Improve last log output
Upstream-commit: 2a20e852032339b4c91a01748119701c7ada234d
Component: engine
2013-06-27 11:10:19 -07:00
Gabriel Monroy
a223caa9e6 + Runtime: mount volumes from a host directory with 'docker run -b'
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
Guillaume J. Charmes
167474d709 Display containers logs in case of build failure
Upstream-commit: 27d67773768222ffc57f124b38c767f36a575f96
Component: engine
2013-06-26 12:50:20 -07:00
Solomon Hykes
7c517d635a Merge branch 'simpler-build-upload' (#900) into builder_server-3 (#848)
Upstream-commit: 352991bdf4c0a7702fcc791b961a516fb684f4c1
Component: engine
2013-06-20 22:02:36 -07:00
Guillaume J. Charmes
9587bb386c Merge branch 'master' into builder_server-3
Conflicts:
	docs/sources/use/builder.rst
Upstream-commit: 659e8460060d2216329d874cf6617fc24ec479fd
Component: engine
2013-06-20 10:27:12 -07:00
Solomon Hykes
eb87dc37e0 Merge branch 'master' into simpler-build-upload
Upstream-commit: 79efcb545d76970843e02c48492a61450dba5564
Component: engine
2013-06-19 18:48:19 -07:00
Solomon Hykes
41c1e7ceb7 * Builder: fixed the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented.
Upstream-commit: 5be7b9af3ee9b884482220979735e2a8ea969ce3
Component: engine
2013-06-18 20:28:49 -07:00
Guillaume J. Charmes
61d11ddffb Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
Upstream-commit: 34a434616a7056a89328348ce3f92afd2730c777
Component: engine
2013-06-18 16:12:30 -07:00
Solomon Hykes
4ff35be219 Nicer output for 'docker build'
Upstream-commit: cb9d0fd3bc13a381f3017d06cd057da2cd3f1c15
Component: engine
2013-06-18 12:26:56 -07:00
Guillaume J. Charmes
0b3b002cd4 Merge branch 'master' into builder_server-3
Conflicts:
	buildfile_test.go
Upstream-commit: 555552340dd07eb446e54011071a621430fd83a0
Component: engine
2013-06-17 14:01:32 -07:00
Solomon Hykes
fe13f8b67b Merge pull request #897 from dotcloud/fix-overlapping-add
* Builder: ADD improvements: use tar for copy + automatically unpack local archives
Upstream-commit: 22b0a38df51acd9f96ae1a82f8a5b86640b5f3b5
Component: engine
2013-06-17 13:32:34 -07:00
Solomon Hykes
4bba5db0ac * 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.
Upstream-commit: 38554fc2a722d1a77514f477a189b0dbd149691b
Component: engine
2013-06-15 09:38:18 -07:00
Solomon Hykes
8e1839cf72 Fix a bug which caused builds to fail if ADD was the first command
Upstream-commit: 080f35fe65a7bb88ccf2abefa985c7a4ae88a47b
Component: engine
2013-06-15 09:16:35 -07:00
Solomon Hykes
2105eec29d + 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.
Upstream-commit: 5b8287617de65d4e14ed6affb0eb46867e9ee617
Component: engine
2013-06-14 16:43:39 -07:00
Guillaume J. Charmes
57ce6972e0 Fix issue with ADD
Upstream-commit: f03ebc20aa33dbb9b468fe476ce26467eb328060
Component: engine
2013-06-13 18:42:27 -07:00
Guillaume J. Charmes
18df81b8e1 Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
	commands.go
	docs/sources/api/docker_remote_api.rst
Upstream-commit: 4b4918f2a78c129c4ca745147fd38f985d2635c2
Component: engine
2013-06-13 18:11:22 -07:00
Guillaume J. Charmes
c822b87ed3 Remove run() where it is not needed within the builder
Upstream-commit: 452128f0daf8117502fad2fe2f72b6f022223ddb
Component: engine
2013-06-13 15:18:15 -07:00
Guillaume J. Charmes
30e88c1b6c Remove run from non-running commmands
Upstream-commit: f5fe3ce34e12f1660ee98cecdbe2c104567d88a6
Component: engine
2013-06-13 15:08:53 -07:00
Guillaume J. Charmes
cac3a28159 Remove run from the ADD instruction
Upstream-commit: d0084ce5f23453fbc008f5a2c5dd147b0df890e7
Component: engine
2013-06-13 14:57:50 -07:00
Victor Vieux
0a236e493a bump to master
Upstream-commit: f2383151cbcc727450f87cb80a392e2858d4b0ca
Component: engine
2013-06-12 17:39:32 +00:00
Francisco Souza
18e0ba9ccf build: don't ignore last line in Dockerfile when it doesn't end with \n
Upstream-commit: 2e9403b047d926d39d5b299abc071f3c29627fc6
Component: engine
2013-06-11 11:39:06 -03:00
Guillaume J. Charmes
0891327703 Allow multiple tab/spaces between instructions and arguments
Upstream-commit: b103ac70bfb9f9419d4487bf969b0f244b260014
Component: engine
2013-06-10 09:31:59 -07:00