Commit Graph
18 Commits
Author SHA1 Message Date
Charles Hooper 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
Jonathan Rudenberg 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
Solomon Hykes fe7f976896 Merged branch sa2ajj/top-level-makefile
Upstream-commit: d8dc6d4583a8bbe24c889f3a7dff749e4721fe2d
Component: engine
2013-03-27 11:50:01 -07:00
Mikhail Sobolev 7d458dec18 use .gopath/ instead of build/
Upstream-commit: a57b37ed0e1531e7cc7b8c91ecf73a904c067891
Component: engine
2013-03-26 17:19:57 +02:00
Mikhail Sobolev fc4f69a147 introduce top-level Makefile to build the docker binary
Upstream-commit: 7009d6c6ddc2acc77e7caa227c08ecf29d747298
Component: engine
2013-03-26 17:19:54 +02:00
Thatcher Peskens ebcf223856 Merge of docker-website into the docker documentation.
Upstream-commit: 69b09ccfc80b9411504604ace550ac2fea8cf45a
Component: engine
2013-03-25 19:52:52 -07:00
creack 72cdef50aa Move the debian makefile to avoid confusions
Upstream-commit: 08cb430281bb1aa003f21a983029dd934bd99a10
Component: engine
2013-03-22 04:34:46 -07:00
creack 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
creack a9ffc585e7 Comply the tests with golang TIP
Upstream-commit: d8fa52b7b5b6101538c15735500b3a01327ca96f
Component: engine
2013-03-21 10:31:02 -07:00
Solomon Hykes bb5d485b62 Merged branch 79-rmi_regexp-feature
Upstream-commit: bb5b7897a419ce49ce4600bcc24ec28d1af8c923
Component: engine
2013-03-15 14:08:02 -07:00
creack 60f8e4260a Add entries to the gitignore
Upstream-commit: 4d80958b016b8055c166393cb5e0e69f7a30441e
Component: engine
2013-03-15 01:28:09 -07:00
Solomon Hykes 4086a22f6e Moved debian-specific files to ./deb, minor fixes to Makefile
Upstream-commit: 0b5e223b4e7d38a6511424d24c8cc12ec9c021de
Component: engine
2013-03-13 21:22:30 -07:00
Solomon Hykes 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
creack 8990ed16c8 Add *.orig to .gitignore
Upstream-commit: 6908628b555a1583f079f04ed34f5d81ce917459
Component: engine
2013-03-12 08:06:22 -07:00
Solomon Hykes b9049f5277 Changed .gitignore to not match docker/*.go
Upstream-commit: 278aa5f045ad6dd8718933b4736c29567a17717a
Component: engine
2013-02-26 17:29:11 -08:00
Brian McCallister 1b8770e955 ignore .vagrant
Upstream-commit: ac15003c05a844aa08e591ff7675ff6a406f188b
Component: engine
2013-02-23 13:59:06 -07:00
Brian McCallister cb554356a9 ignore produced binaries
Upstream-commit: 7e5dfc51ade66d75c1429a05334b500d1cb8db20
Component: engine
2013-02-19 20:49:06 -07:00
Solomon Hykes f86f39ff84 .gitignore
Upstream-commit: ffc8d1e7b97bd9fce380f310e18dcd1402c7c9ac
Component: engine
2013-02-13 16:38:50 -08:00