Commit Graph
2127 Commits
Author SHA1 Message Date
Solomon Hykes f6b73ea991 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 968e08a9babaeb13ae342da8e966c87e96b42e8a
Component: engine
2013-06-07 02:41:08 +02:00
Guillaume J. Charmes f2a91760de Update documentation for docker build
Upstream-commit: 2cc22de696d5a0847ecd7d07eaee1d7f385dd29c
Component: engine
2013-06-06 16:48:36 -07:00
Guillaume J. Charmes 3da26f2291 Implement build from git
Upstream-commit: 12c9b9b3c94d595ab155fc90dfc426eeada8bc75
Component: engine
2013-06-06 16:41:41 -07:00
Guillaume J. Charmes 7b79f826ad Move the docker build URL form client to server, prepare for GIT support
Upstream-commit: a11e61677c7b368628975e2a0ead639b5bfcabb9
Component: engine
2013-06-06 16:09:46 -07:00
Guillaume J. Charmes 2d381c7b09 Allow to docker build URL
Upstream-commit: 01f446e908305efb86f9cbfbbe3302366a6ccd45
Component: engine
2013-06-06 15:56:09 -07:00
Guillaume J. Charmes 9ad1867af2 Move isUrl to utils.IsURL
Upstream-commit: f4a4cfd2cc748859d4f28b90274c81098afa8d5d
Component: engine
2013-06-06 15:50:09 -07:00
Guillaume J. Charmes 6e022d99e9 Fix issue EXPOSE override CMD within builder
Upstream-commit: eaa2183d77435bd5d65f36287e96a341696cb79c
Component: engine
2013-06-06 15:48:12 -07:00
Guillaume J. Charmes 6bac392c45 Allow remote url to be passed to the ADD instruction within the builder
Upstream-commit: 31d2b258c15a28402c3fc5df6440c5b8644a6d76
Component: engine
2013-06-06 15:40:46 -07:00
unclejack 8fe98b929a docs: build: ADD copies just needed data w/ full path
Upstream-commit: 4b3a381f39bc90b36877f4832fe5c53de65a1ec3
Component: engine
2013-06-07 00:39:43 +03:00
Solomon Hykes baad17669e Typo in MAINTAINERS file
Upstream-commit: 56473d4cce79b0f06e46d88d14c716c1858188e2
Component: engine
2013-06-06 22:52:55 +02:00
unclejack ed288324ad docs: warn about build data tx & ADD w/o context
This updates the documentation to mention that:
1. a lot of data may get sent to the docker daemon if there is a lot of
data in the directory passed to docker build
2. ADD doesn't work in the absence of the context
3. running without a context doesn't send file data to the docker
daemon
4. explain that the data sent to the docker daemon will be used by ADD
commands
Upstream-commit: efa7ea592c1819f006acf9480c10e50ec63b3001
Component: engine
2013-06-06 22:06:12 +03:00
Guillaume J. Charmes 161e186417 Solve an issue with the -dns in daemon mode
Upstream-commit: afd325a8845ad7c4846747fb9561df12ebf9963a
Component: engine
2013-06-06 11:01:29 -07:00
Guillaume J. Charmes 0828523946 Check for local dns server and output a warning
Upstream-commit: a3f6054f974909458c9e820842310987e225b767
Component: engine
2013-06-06 11:01:09 -07:00
Sam Alba f485f9f4c0 Update README.md
Upstream-commit: da937bf214d781af9c3eb955e1b33e78359892e2
Component: engine
2013-06-06 11:09:11 -06:00
Solomon Hykes 0c23e5a2a9 Daniel Mizyrycki is maintainer of dockerbuilder, the official build environment for docker binary releases
Upstream-commit: 42b63eb81884d6e6b1dc325397195cffd880f493
Component: engine
2013-06-06 19:06:54 +02:00
Solomon Hykes cfd63a0293 docker-build contrib script is deprecated by the new 'build' command
Upstream-commit: 0d6db333d6b4944a228848a9f451d6a647324b40
Component: engine
2013-06-06 19:05:21 +02:00
Solomon Hykes 075d1e6e0c Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 3999465c8569938cf859b24ea2bdd763fe1f3ceb
Component: engine
2013-06-06 19:04:17 +02:00
Daniel Mizyrycki 177513451e Merge pull request #827 from dotcloud/dev_environment_update
Update "Setting Up a Dev Environment" doc, with modern golang  PPA and stable lxc kernel
Upstream-commit: 1cc4049e82263ee23e27cfae2900120aa87f50a5
Component: engine
2013-06-06 09:48:19 -07:00
Victor Vieux 4c703f4b7e add [] and move errors to stderr
Upstream-commit: 4107701062bc729d06e1729e2b4c8c92b3b8b4f2
Component: engine
2013-06-06 15:45:08 +00:00
Victor Vieux 57300503a5 allow multiple params in inspect
Upstream-commit: a799cdad3e25136ff313d692b9972cb725754055
Component: engine
2013-06-06 15:22:54 +00:00
Victor Vieux 11abae76ab changed to 12.04 and add kernel
Upstream-commit: a118ad90edbb232806345c4038f3e9e68098648c
Component: engine
2013-06-06 12:36:28 +00:00
Thatcher Peskens 1dbf41a0b1 Fixed some links
* Added Google group to FAQ on docs
* Changed IRC link
* Fixed link to contributing broken by 326faec
Upstream-commit: 0f23fb949dd894ff70641cc01ac116aa55083157
Component: engine
2013-06-05 18:06:51 -07:00
Thatcher 106de1dac7 Merge pull request #817 from dhrp/blog-in-navigation
Modified the navigation in both website and documentaion to include the blog.
Upstream-commit: f1992eeea5d7945164f2732aea805ad3a06cc3b8
Component: engine
2013-06-05 17:28:19 -07:00
Guillaume J. Charmes 72a9843fea Add -dns to docker daemon
Upstream-commit: 84d68007cb36b68e1b5c574a0d23fcf583e0d75c
Component: engine
2013-06-05 14:20:54 -07:00
Victor Vieux fafb25034a bump to master again
Upstream-commit: bf63cb904592e1ca73aa3990c08ea0b752fec14d
Component: engine
2013-06-05 16:01:36 +00:00
Victor Vieux 0ba1139399 bump to master
Upstream-commit: ce0041832c95f9a1d4ea407c3a3c78d8ae08df61
Component: engine
2013-06-05 15:30:45 +00:00
Solomon Hykes f9dd73b38e hack/PRINCIPLES.md: a list of principles guiding Docker's design. The goal is to scale the decision-making in the project and remove @shykes as a bottleneck as much as possible
Upstream-commit: 97d5f525f42cae0468239de0a924d6fda920b48a
Component: engine
2013-06-05 17:27:53 +02:00
Solomon Hykes 4a7f6e2213 hack/ROADMAP.md: a high-level roadmap. Make a pull request to suggest changes
Upstream-commit: 2ea29ce0ef5bd507497fe65d2507bc6ff52fd9fb
Component: engine
2013-06-05 17:26:26 +02:00
Solomon Hykes 493cee7e83 Merge pull request #822 from lopter/master
* Client: Print the container id before the hijack in `docker run` (see also #804)
Upstream-commit: 068076f775e88526bbfa19734fc1c34232e961b5
Component: engine
2013-06-05 08:08:30 -07:00
Solomon Hykes 3c1eb7bce7 Merge pull request #812 from dotcloud/809-progress_message-fix
* Remote API: Fix progress message in client
Upstream-commit: 34c8b24211c51b6f48109e2c9d23212153c6acaa
Component: engine
2013-06-05 07:27:31 -07:00
Victor Vieux 28f01e9e4d update doc to newer go
Upstream-commit: e3cc625315ffdc47e6ea8d94812c7423853435b8
Component: engine
2013-06-05 13:19:49 +00:00
Victor Vieux dfee088c2a move xino stuff to /dev/shm
Upstream-commit: f67ea78cce83114998390c16305a6869c72f5100
Component: engine
2013-06-05 12:59:05 +00:00
Victor Vieux d64fde4d70 updated doc
Upstream-commit: 62551129263e339d7ca9c21afbd4eda16452c6da
Component: engine
2013-06-05 13:19:57 +02:00
Victor Vieux 83d9b24a84 bump to master
Upstream-commit: c906239220c7ba06b8615f001fab2f42fb063aeb
Component: engine
2013-06-05 10:23:45 +00:00
Victor Vieux e1f455fc5a bump to master
Upstream-commit: b4682e6707301b650f041b877db0ea0053a9b340
Component: engine
2013-06-05 10:19:51 +00:00
Solomon Hykes 7107c2c6ed Merge pull request #818 from johncosta/ubuntu-1304-add-apt-repository
Remove provider specifc language
Upstream-commit: 04050c4173b92b6f7b4d6a6da812dc8cb955c01f
Component: engine
2013-06-05 02:40:09 -07:00
Louis Opter 3e3f9aa3ed Print the container id before the hijack in docker run (see also #804)
This is useful when you want to get the container id before you start to
interact with stdin (which is what I'm doing in dotcloud/sandbox).
Upstream-commit: 7e6ede63794b54bcc0d67d86ea60e76b701d286f
Component: engine
2013-06-04 15:32:59 -07:00
Guillaume J. Charmes 8f6d6bc6c7 Fix nil pointer on some situatuion
Upstream-commit: 63e80384ea753c74046c2a4c3f64229c359f466f
Component: engine
2013-06-04 14:35:32 -07:00
Guillaume J. Charmes 82ddfc6a07 Put back panic for go1.0.3 compatibility
Upstream-commit: 7ef9833dbb299ebf796092a6921127ea77d38337
Component: engine
2013-06-04 14:26:40 -07:00
Guillaume J. Charmes 2dea62a6a6 Merge pull request #808 from dotcloud/795-lintify
Cleanup source
Upstream-commit: c1ee9bf8817980c4577f914c0bc7b532f4b3000c
Component: engine
2013-06-04 14:20:38 -07:00
John Costa 2fdc41e83d Remove provider specifc language
Upstream-commit: c000ef194c0259bfe631222b19a2bc204281f836
Component: engine
2013-06-04 16:01:38 -04:00
Ken Cochrane 0661d79fa2 Merge pull request #802 from johncosta/ubuntu-1304-add-apt-repository
- Documentation: adding missing dependency to the ubuntu linux install page.
Upstream-commit: 479ac9afa7159f2da7c9cb4dd33fef8a4cf85474
Component: engine
2013-06-04 11:55:34 -07:00
Thatcher Peskens 7b912efeab Modified the navigation in both website and documentaion to include the Blog.
Upstream-commit: 716892b95dd292c62d9bc7ca2951176e94657b00
Component: engine
2013-06-04 11:41:54 -07:00
Thatcher a70741569b Merge pull request #796 from dhrp/added-and-fixed-links
Added and fixed some links (closes #502)
Upstream-commit: d7a6485dfe5b5d8db9c1eba308bca88f086833ad
Component: engine
2013-06-04 11:28:40 -07:00
Victor Vieux 4747c5b99f linted names
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
Victor Vieux 0b2167b3b8 fix progress message in client
Upstream-commit: 3922691fb99a99cec0a5d239da522cc3d8778e6c
Component: engine
2013-06-04 16:09:08 +00:00
Sam Alba a28b4da480 Merge pull request #810 from dotcloud/proxy-fix
fix regression on proxy
Upstream-commit: c566c8efc7dad967e1dcb59afbe034fa42f543ff
Component: engine
2013-06-04 08:46:40 -07:00
Victor Vieux ae659077aa fix proxy
Upstream-commit: 06b585ce8a397fffcc9051e2faa6f968e51fccd5
Component: engine
2013-06-04 15:44:27 +00:00
John Costa f0b09674bb some installations of ubuntu 13.04 (digital ocean Ubuntu 13.04 x64 Server in this case) require software-properties-common to be installed before being able to use add-apt-repository
Upstream-commit: e61af8bc62c84a1bc70d0b323c1b6bf21dddb4b6
Component: engine
2013-06-04 10:40:44 -04:00
Victor Vieux f1e23ad555 bump to master
Upstream-commit: b6825f98c04f5d42efa4d7c177d66466ad404f4f
Component: engine
2013-06-04 14:00:18 +00:00