Commit Graph

27 Commits

Author SHA1 Message Date
2cf8cc3b3a Remove Vagrantfile and remove it from all docs
This removes the Vagrantfile and updates the documentation to remove
the steps which explain how to install Docker in a VM via Vagrant.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 67d55860a52bec8b1a1327355b4f27674ec912aa
Component: engine
2014-02-22 03:25:32 +02:00
121a1998cc tell anyone that might want to ignore their editor choice's backup files that there is a better way - thanks @pnasrat
Upstream-commit: 7b95d410926bffa6d8f42095fa8b38e01a5ac67b
Component: engine
2013-11-27 13:19:06 +10:00
ba4e682cde docker-ci 0.4.5: Sync tests with progress in docker and docker-registry. Use revamped shiny DinD.
Upstream-commit: 249f76bebdb3c24ae0a59e3be7ae73fd1d88c065
Component: engine
2013-11-06 20:05:26 -08:00
6bdd999b91 Add "vendor/pkg/" to .gitignore now that we "go test -i"
Upstream-commit: 4870265a9f07b443fa06df07c50ddd6f13c9f13f
Component: engine
2013-10-18 12:18:13 -06:00
04ac9582d3 hack/vendor.sh: overwrite existing dependencies and remove .git so they can be checked in
Upstream-commit: 45cedefadb444e8d7305defd246c63537fca04df
Component: engine
2013-09-11 18:38:09 -07:00
911d6019d5 gitignore: ignore bundles directory
Upstream-commit: 19dc3b0792272c2f0fbcfb654349fe5e86bc8046
Component: engine
2013-09-07 17:35:49 -07:00
9327ca0955 move deps installation to vendor.sh script
Upstream-commit: 20d24a450cbf22b6d5268bc1fe76022fa554d6be
Component: engine
2013-09-07 17:35:48 -07:00
45d797043b gitignore all test files
Upstream-commit: a43bae4c0b6f3ec632636be544a6816f5f62dcb0
Component: engine
2013-08-10 13:48:24 -04:00
92fbe05ddb Cleaning up the welcome page, terminology, and images.
Upstream-commit: ff964d327d030221b4e65661cee0ee0826bcdb32
Component: engine
2013-07-02 15:03:29 -07:00
91838166e9 Merge pull request #184 from titanous/simplify-vagrant
vagrant: Simplify provisioning to build from repo
Upstream-commit: daa7e4a2034f65197222eab94ea46e4d5a3400e7
Component: engine
2013-03-27 19:07:20 -07:00
73606e3c52 vagrant: Simplify provisioning to build from repo
This sets up an idiomatic Go workspace in /opt/go with the source
shared from the host directory in
/opt/go/src/github.com/dotcloud/docker and docker installed into
/opt/go
Upstream-commit: a3ab89df2b3d9ba654ba85af5d71d063d401f23f
Component: engine
2013-03-27 21:55:25 -04:00
fe7f976896 Merged branch sa2ajj/top-level-makefile
Upstream-commit: d8dc6d4583a8bbe24c889f3a7dff749e4721fe2d
Component: engine
2013-03-27 11:50:01 -07:00
7d458dec18 use .gopath/ instead of build/
Upstream-commit: a57b37ed0e1531e7cc7b8c91ecf73a904c067891
Component: engine
2013-03-26 17:19:57 +02:00
fc4f69a147 introduce top-level Makefile to build the docker binary
Upstream-commit: 7009d6c6ddc2acc77e7caa227c08ecf29d747298
Component: engine
2013-03-26 17:19:54 +02:00
ebcf223856 Merge of docker-website into the docker documentation.
Upstream-commit: 69b09ccfc80b9411504604ace550ac2fea8cf45a
Component: engine
2013-03-25 19:52:52 -07:00
72cdef50aa Move the debian makefile to avoid confusions
Upstream-commit: 08cb430281bb1aa003f21a983029dd934bd99a10
Component: engine
2013-03-22 04:34:46 -07:00
977b51bc15 Integrate Auth in runtime and make the config file relative to runtime root
Upstream-commit: c72ff318d3fb6ab887af21cf4410e1bc8104663a
Component: engine
2013-03-22 02:19:39 -07:00
a9ffc585e7 Comply the tests with golang TIP
Upstream-commit: d8fa52b7b5b6101538c15735500b3a01327ca96f
Component: engine
2013-03-21 10:31:02 -07:00
bb5d485b62 Merged branch 79-rmi_regexp-feature
Upstream-commit: bb5b7897a419ce49ce4600bcc24ec28d1af8c923
Component: engine
2013-03-15 14:08:02 -07:00
60f8e4260a Add entries to the gitignore
Upstream-commit: 4d80958b016b8055c166393cb5e0e69f7a30441e
Component: engine
2013-03-15 01:28:09 -07:00
4086a22f6e Moved debian-specific files to ./deb, minor fixes to Makefile
Upstream-commit: 0b5e223b4e7d38a6511424d24c8cc12ec9c021de
Component: engine
2013-03-13 21:22:30 -07:00
621d110d7f Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon
Upstream-commit: 745edc49cdcf0dc02fe714b0772f146fc8a66d23
Component: engine
2013-03-13 00:29:40 -07:00
8990ed16c8 Add *.orig to .gitignore
Upstream-commit: 6908628b555a1583f079f04ed34f5d81ce917459
Component: engine
2013-03-12 08:06:22 -07:00
b9049f5277 Changed .gitignore to not match docker/*.go
Upstream-commit: 278aa5f045ad6dd8718933b4736c29567a17717a
Component: engine
2013-02-26 17:29:11 -08:00
1b8770e955 ignore .vagrant
Upstream-commit: ac15003c05a844aa08e591ff7675ff6a406f188b
Component: engine
2013-02-23 13:59:06 -07:00
cb554356a9 ignore produced binaries
Upstream-commit: 7e5dfc51ade66d75c1429a05334b500d1cb8db20
Component: engine
2013-02-19 20:49:06 -07:00
f86f39ff84 .gitignore
Upstream-commit: ffc8d1e7b97bd9fce380f310e18dcd1402c7c9ac
Component: engine
2013-02-13 16:38:50 -08:00