cacdb75159
Merge pull request #1138 from dotcloud/1123-rmi_conflict-fix
...
* Runtime: Fix error in rmi when conflict
Upstream-commit: ad33e9f38866fa4f5c62d9974d96ee1b324ea5dc
Component: engine
2013-07-08 05:19:05 -07:00
203bc7383a
Fixed runtime_test (ImagePull prototyped changed)
...
Upstream-commit: e2b8ee2723a4cf6a37cdb455011ec447f23f8f49
Component: engine
2013-07-05 16:03:22 -07:00
a64e91af3a
Merge pull request #1144 from dotcloud/standalone_registry
...
* Registry: Standalone registry
Upstream-commit: 07dc0a51205b5dcfa5525acf15e1d500f201fa12
Component: engine
2013-07-05 15:56:48 -07:00
7ec374d04b
Code cleaning
...
Upstream-commit: d3125d8570de0f9c09de94c657f7e35755accdef
Component: engine
2013-07-05 15:26:08 -07:00
76ecb3f5a4
fmt.Errorf instead of errors.New
...
Upstream-commit: 283ebf3ff92ef552ae9cdf23a17c1a375dac99bd
Component: engine
2013-07-05 14:56:56 -07:00
fba3efb6e1
Fixed ping URL
...
Upstream-commit: 4c174e0bfb4c6e6333f39fff3c70058eaed37e3a
Component: engine
2013-07-05 14:55:48 -07:00
44c8a27b06
Allowing namespaces in standalone registry
...
Upstream-commit: 57a6c83547ba4671940c3134a3f68586db603048
Component: engine
2013-07-05 14:30:43 -07:00
5ee43e9d28
Restoring old changeset lost by previous merge
...
Upstream-commit: cfc7684b7de542cfed9d8b90b654fe59c8aa4098
Component: engine
2013-07-05 12:37:07 -07:00
bf4fc24d05
Merging from master
...
Upstream-commit: be49f0a1182164d0d279484ec35931c1e3ef6d3c
Component: engine
2013-07-05 12:27:10 -07:00
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
00b3b197f8
Merge pull request #1127 from cespare/patch-1
...
Typo fix
Upstream-commit: 6940cf1ecd982e5087d614193e1e655383721c44
Component: engine
2013-07-05 10:48:59 -07:00
36c6877ea9
Revert #1126 . Remove mount shm
...
Upstream-commit: 4e0cdc016a5eb7227d4b8d7daffba7335fcbe749
Component: engine
2013-07-05 10:47:00 -07:00
c5f9d84a7d
Merge pull request #1129 from cespare/style-fixes-2
...
Style fixes for fmt + err usage.
Upstream-commit: 8a8109648a7b99acf6aff9336a39150f2c6e05a4
Component: engine
2013-07-05 10:31:53 -07:00
b40dc53b63
Merge pull request #1126 from karanlyons/patch-1
...
* Runtime: Mount /dev/shm as a tmpfs.
Upstream-commit: dc8b3593190625378c66a901fdcc1d962fc8fc87
Component: engine
2013-07-05 10:31:05 -07:00
5824d26e27
Fix error in rmi when conflict
...
Upstream-commit: dea29e7c999b7ef76a816867a2cb75c2da658fa2
Component: engine
2013-07-05 16:58:39 +00:00
efb2d72b4c
Merge pull request #1133 from dotcloud/775-testing-notifications
...
testing, issue #775 : Add automatic testing notifications to docker-ci
Upstream-commit: ab6379b3e0fb0a4de5e08a2f1dfd285c60452a51
Component: engine
2013-07-04 21:48:00 -07:00
0bad98719b
testing, issue #775 : Add automatic testing notifications to docker-ci
...
Upstream-commit: f7fed2ea5f811719bd8bd2e6111838ad50a53194
Component: engine
2013-07-04 21:43:46 -07:00
8f22c9d604
Merge pull request #1132 from dotcloud/776-testing-commit
...
testing, issue #776 : Ensure docker-ci test docker code as it was at commit time
Upstream-commit: 35e87ee5717fd042d9cd81ca113f2b27fcaf03f4
Component: engine
2013-07-04 20:37:51 -07:00
079055d521
testing, issue #776 : Ensure docker-ci test docker code as it was at commit time
...
Upstream-commit: ab3893ff4d202549bf79e5671cc9e6f18376cbfd
Component: engine
2013-07-04 20:28:54 -07:00
2eb55531d3
Style fixes for fmt + err usage.
...
fmt.Printf and friends will automatically format using the error
interface (.Error()) preferentially; no need to do err.Error().
Upstream-commit: 1277dca3358874d0701685f7ebb52ce66be1b385
Component: engine
2013-07-04 14:33:17 -07:00
15bf500531
Typo fix
...
Error message grammar tweak
Upstream-commit: ba9aef6f2c529ccea571deacc46d2a61ca74a8bc
Component: engine
2013-07-04 12:40:14 -07:00
a0d0d12548
Mount /dev/shm as a tmpfs.
...
Fixes #1122 .
Upstream-commit: dd619d2bd6a3cf621106f2599fbf3bc903b5801a
Component: engine
2013-07-04 09:58:50 -07:00
c61eaae7b1
Merge pull request #1111 from cespare/style-fixes
...
Style fixes
Upstream-commit: bcb5e36dd9ed3054c5efad0aa9a9904dcd497338
Component: engine
2013-07-03 14:46:05 -07:00
1c71d0a65e
Implement several golint suggestions, including:
...
* Removing type declarations where they're inferred
* Changing Url -> URL, Id -> ID in names
* Fixing snake-case names
Upstream-commit: 19121c16d9514b391ce8f15aeff3c47c1ea5a841
Component: engine
2013-07-03 14:36:04 -07:00
36eac88873
Simplify the NopWriter code.
...
Upstream-commit: 27ee261e6048c6fa0334bcce2116610dcd04aaed
Component: engine
2013-07-03 14:35:18 -07:00
f4980e7dfe
Gofmt -s (simplify)
...
Upstream-commit: da3962266a4103f2dbf019180585d206fb9e25ff
Component: engine
2013-07-03 14:35:18 -07:00
e510808505
Use fmt.Errorf when appropriate.
...
Upstream-commit: e93afcdd2bd9578f98508aaad11b695dae29726e
Component: engine
2013-07-03 14:35:18 -07:00
03f2d7e4a6
Typo correction: Excepted -> Expected'
...
Upstream-commit: dd1b9e38e95dc719a7aeadbdee67a5f3a4873dec
Component: engine
2013-07-03 14:35:18 -07:00
e37fa79f37
Merge pull request #1112 from cespare/mutex-style
...
Mutex style change.
Upstream-commit: 96bc9ea7c113127673e6e47a0366311e1edb8f1a
Component: engine
2013-07-03 10:34:32 -07:00
ce8c962683
Merge pull request #1053 from dynport/do-not-copy-hostname-from-image
...
do not merge hostname from image
Upstream-commit: 16c8a10ef969fd9c87a96df69807b2928cd669de
Component: engine
2013-07-03 10:34:15 -07:00
3022226088
Merge pull request #1109 from dynport/remote-lookup-fix
...
Fix remote lookup when pushing into registry
Upstream-commit: 5dcd11be16f732f68199b9ee96ce76190b64a9aa
Component: engine
2013-07-03 06:29:19 -07:00
bb648657e1
Merge pull request #1113 from metalivedev/docs20130702
...
* Documentation: fix broken link on the documentation index page
Upstream-commit: dc91a7b6411801f03a17b253fe8500da106112f7
Component: engine
2013-07-03 05:52:25 -07:00
7033d58dca
Fix installation link from welcome page.
...
Upstream-commit: 11998ae7d62ee17856ead81ce49409dc63643d62
Component: engine
2013-07-02 16:48:57 -07:00
8f5746f4d9
Mutex style change.
...
For structs protected by a single mutex, embed the mutex for more
concise usage.
Also use a sync.Mutex directly, rather than a pointer, to avoid the
need for initialization (because a Mutex's zero-value is valid and
ready to be used).
Upstream-commit: 1cf9c80e976fb60b4d5d489cd1c4c9959bcc4f7f
Component: engine
2013-07-02 15:53:08 -07:00
a2abd325b9
Merge pull request #1095 from metalivedev/docs20130627
...
Docs and images updates
Upstream-commit: 6dbcdd3ed5ae87dcb175431a1ad3e6c989ada2a5
Component: engine
2013-07-02 15:13:31 -07:00
cad00c9d8a
fix two obvious bugs???
...
Upstream-commit: 9632cf09bfd7b4a8513799bf19070ecabd55c446
Component: engine
2013-07-02 22:11:03 +00:00
d5551edef2
Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
...
Conflicts:
docs/sources/concepts/manifesto.rst
docs/sources/index.rst
Upstream-commit: 96ab3c540d5f9f8509380f50e790b184beb2be6b
Component: engine
2013-07-02 15:10:07 -07:00
92fbe05ddb
Cleaning up the welcome page, terminology, and images.
...
Upstream-commit: ff964d327d030221b4e65661cee0ee0826bcdb32
Component: engine
2013-07-02 15:03:29 -07:00
4deb63608f
Fix broken quickstart link
...
Upstream-commit: 4b8688f1e5a5998e10bdc1d7b39458a611a25eef
Component: engine
2013-07-02 14:10:06 -07:00
b8221b0ce7
Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
...
Conflicts:
docs/sources/concepts/manifesto.rst
Upstream-commit: 55b5889a0fa74db30e6a07f84b02e22ea41c3e19
Component: engine
2013-07-02 13:00:08 -07:00
ad16b4b27c
Shortened lines to 80 columns
...
Upstream-commit: dd4c6f6a09c98f075fc5964242792d9e9f2c20d4
Component: engine
2013-07-02 12:09:57 -07:00
df5dac21e6
Clean up image text, minor updates to docs.
...
Upstream-commit: 6058261a26b9e23926612fddfd8ad37bfcf1dd9c
Component: engine
2013-07-02 12:09:57 -07:00
09eb5cc9ff
Adding files for terms
...
Upstream-commit: b461e4607de497096b0ec92bb05d5a88bfe0e48d
Component: engine
2013-07-02 12:09:57 -07:00
66a935418f
Cleaning up the welcome page, terminology.
...
Upstream-commit: d399f720983d94706bdaae528a2637778ca5b5e0
Component: engine
2013-07-02 12:09:57 -07:00
831c6f9959
Merge pull request #1107 from eliasp/issue-1020
...
* Runtime: Don't remove the container= environment variable.
Upstream-commit: c9e1c65c640a1ad951586fe8e41f9f1658244f04
Component: engine
2013-07-02 11:42:44 -07:00
f94dc93764
Don't remove the container= environment variable, as it is crucial for a lot of tools to detect, whether they're run inside an LXC container or not.
...
Upstream-commit: e5e47c98629f9e81ea24d2784e04863d614d34f5
Component: engine
2013-07-02 19:13:37 +02:00
a189f7d618
Merge pull request #1103 from shin-/1060-pull-only-tagged-images
...
*Registry: When no tag is specified in docker pull, skip images that are not tagged
Upstream-commit: 1c5083315d1fbee703854bfa336f4aa1b42e5014
Component: engine
2013-07-02 10:08:21 -07:00
9389c940d4
When no tag is specified in docker pull, skip images that are not tagged
...
Upstream-commit: 7cc294e777f8151061efa4a9da5f59d2f992473b
Component: engine
2013-07-02 18:25:06 +02:00
6695c179f1
Merge pull request #987 from dotcloud/601-packaging-ubuntu
...
Packaging|ubuntu, issue #601 : Allow packaging prerm to do its job
Upstream-commit: a20dcfb04974f44d6fd2edd385ffdc03334fb2b3
Component: engine
2013-07-02 08:51:01 -07:00
d6b3d1ae9e
Merge pull request #1101 from dotcloud/fix-unit_tests
...
add sleep in tests and go fmt
Upstream-commit: 8f9dd861467613a081c4584eafadc60acbb7890f
Component: engine
2013-07-02 03:48:24 -07:00
