24e3c9e7b4
Bump version to v1.1.2
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: d84a070e476ce923dd03e28232564a87704613ab
Component: engine
2014-07-23 00:29:56 +00:00
f2f663b7c8
Copy values out of hostConfig
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: vieux)
Upstream-commit: 4e12484ea12d23fd70fd3bf636e786f4f741ab64
Component: engine
2014-07-23 00:20:11 +00:00
25d55543df
Always mark as stopped for non running containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: vieux)
Upstream-commit: 2c185e25c22b82614210908c445a32fa3dbe5ed1
Component: engine
2014-07-23 00:20:04 +00:00
04ff3d25e5
Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: vieux)
Upstream-commit: 21341e9e134399feef88872f11fb4339401cf6f5
Component: engine
2014-07-23 00:19:24 +00:00
ab6dd28c1b
Set state running before dumping to disk
...
Fixes #4766
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Conflicts:
daemon/container.go
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: vieux)
Upstream-commit: 699bc47137ab78b7d88ec7623ad10e04f7b67f33
Component: engine
2014-07-23 00:18:41 +00:00
b782732841
Merge pull request #7167 from unclejack/maintainer_truncindex
...
pkg/truncindex: add unclejack to MAINTAINERS
Upstream-commit: 885cda1ae252b2ca6d256410cc0bb8c0dc7e8823
Component: engine
2014-07-22 17:10:38 -07:00
46232832e7
Merge pull request #7163 from crosbymichael/fix-port-mapping-on-restart
...
Always mark as stopped for non running containers
Upstream-commit: 9e1a9a7d9824be67a9a02b24607b64f3738c7ef4
Component: engine
2014-07-22 16:55:46 -07:00
9140b4810a
Merge pull request #7151 from SvenDowideit/add-version-selection-ux
...
Add version selection ux to the Documentation.
Upstream-commit: 2f23e204d9190895ae761d97495fdbd7093b625a
Component: engine
2014-07-23 09:21:55 +10:00
204cff966e
pkg/units: Better to not use error as var name
...
Better to not use `error` as var name (might eclipse the error type) for
clarity and to prevent subtle bugs.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
Upstream-commit: ea7b8ea03f5c2222060afe435e907c1ab855a44b
Component: engine
2014-07-22 15:39:59 -07:00
c8bd24665b
integcli: fix TestInspectLinksStopped with Go1.3
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: d0cbc54f234b01585670e19b49a8c931b2719472
Component: engine
2014-07-23 01:15:29 +03:00
4d5322d880
Merge pull request #7157 from tianon/check-config-apparmor_parser
...
Add "apparmor_parser" warning to check-config.sh
Upstream-commit: a491d204a0e38f8e42d1f2edfd6e08bc0cd61a50
Component: engine
2014-07-22 15:38:08 -06:00
7e50734905
Merge pull request #7165 from fcarriedo/remove-named-returns
...
pkg/units: Remove unused named returns
Upstream-commit: 314bf61889d20945638e67cecde9fe98f273d5eb
Component: engine
2014-07-22 14:37:49 -07:00
f95bb42771
Merge pull request #7169 from fredlf/update_osx-install
...
Initial revisions to b2d doc, new screenshots.
Upstream-commit: 0d118ffbf83711bf8f6271308e290ab011bc460e
Component: engine
2014-07-23 07:34:06 +10:00
724ac12239
Initial revisions to b2d doc, new screenshots.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Final revisions to B2D doc.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 4002b4623c91d94d93f8575c4a554392202aa44d
Component: engine
2014-07-22 13:14:42 -07:00
24cf66b391
pkg/truncindex: add unclejack to MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 7407664c6621782101f73162b7f0ad76a53fa46b
Component: engine
2014-07-22 23:08:28 +03:00
10f00b2b3a
pkg/units: Remove unused named returns
...
Remove named returns since not used in function body. Might prevent
potential subtle bugs.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
Upstream-commit: 588090c49bf2ec077626d89196515e6bef1f7a69
Component: engine
2014-07-22 12:16:50 -07:00
1ce4404428
Merge pull request #7162 from nathanleclaire/tar-with-options-err-check
...
Add missing error check
Upstream-commit: c838a4be2921f76bfaab2ef2641b8c2562c7b2dd
Component: engine
2014-07-22 11:37:21 -07:00
2575c87da6
Merge pull request #7160 from fcarriedo/7159-test-coverage
...
pkg/units: Increased test coverage
Upstream-commit: ceddf4c0e8da32c302f9fbfe3183d8c2acb80e31
Component: engine
2014-07-22 11:27:46 -07:00
951216bd40
Add missing error check
...
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com > (github: nathanleclaire)
Upstream-commit: a1c5f268e5465e0b3cdb4e2a47c0ade3de7988c0
Component: engine
2014-07-22 10:41:58 -07:00
64c32c0b31
pkg/units: Increased test coverage. Closes #7159 .
...
Increased coverage:
* Added test cases to size_test.go
* Added coverage for duration.go
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
Upstream-commit: c47ab1425f0cf08168af7e5561e39ff2e39625e0
Component: engine
2014-07-22 09:56:58 -07:00
d94a180ef6
Add "apparmor_parser" warning to check-config.sh
...
If AppArmor is enabled on the current system, but "apparmor_parser" isn't installed, it causes all kinds of issues.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 75ba7a9b32bc5904ef1b2751deff94283fce34a5
Component: engine
2014-07-22 10:34:28 -06:00
e47a5bae71
Updating to reflect changes in the SoftLayer portal and product naming conventions.
...
Docker-DCO-1.1-Signed-off-by: Phil Jackson <underscorephil@gmail.com > (github: underscorephil)
Upstream-commit: f1e072c8d5266b9c4b320458bffcd87254b36c55
Component: engine
2014-07-22 10:39:40 -05:00
a1bdcc2e10
Get an extra pair of eyes on the Softlayer installation docs
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 29f1ed833cc4cb06dc3f65f440736915111152a0
Component: engine
2014-07-22 20:25:21 +10:00
5fa2981ff0
avoid publishing to the root unless specified, so old version releases only goto their own dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4d109f6158c7607ee4cd9907b17ddba5f4d29d04
Component: engine
2014-07-22 19:05:18 +10:00
7bd6a5929b
Add more details so I have more of an over-view of what I need to
...
automate
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 3472c006c4246977eb4fd8c9d55ab416eb5c3d50
Component: engine
2014-07-22 18:04:48 +10:00
eb7d72cb32
the build cache is too agressive, and I am regularly getting builds using an old version - forcing the issue
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 3853a9c612e3d19dadea26153c9cebaec8cd67a4
Component: engine
2014-07-22 17:21:03 +10:00
eeb4d6b698
Copy values out of hostConfig
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: ddb2086ca9e0991ca12e0771a0e581e782c57f50
Component: engine
2014-07-22 00:16:26 -07:00
71d1cc48f0
Reorganize and clarify the DOCKER_BUILDTAGS docs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 1b31a80eb78789834b8a7d4daff583f0b9a938ed
Component: engine
2014-07-21 22:00:26 -06:00
25ed902e49
Always mark as stopped for non running containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: a091d949acd35d93c4f66af7bfad93a79b591990
Component: engine
2014-07-21 19:59:44 -07:00
bbc55c5d41
Merge pull request #7134 from MidnightDesign/patch-1
...
Fix a typo in the tutorial
Upstream-commit: 9dc82e6102f25b9d0da1410616a4af830e4349f4
Component: engine
2014-07-22 12:00:06 +10:00
ccf84ea953
Merge pull request #7112 from proppy/patch-8
...
docs/installation/google: update gcloud options
Upstream-commit: 1cc55fda3d53d2d54a877b85f36008b0654af9f4
Component: engine
2014-07-22 11:22:08 +10:00
74853679b5
Merge pull request #7030 from runvnc/patch-1
...
Better example for data container
Upstream-commit: 324010ad66f4fa393f53cbfa2fa68d21dabb5941
Component: engine
2014-07-22 10:49:27 +10:00
ac0be9871d
Merge pull request #6569 from bcexelbi/rhel-install-update
...
Updated Red Hat Enterprise Linux installation instructions for version 7
Upstream-commit: 8f75de2d4e11c12a7d17726f005f03e742f12057
Component: engine
2014-07-22 10:30:18 +10:00
a4488cce4c
Merge pull request #7078 from unclejack/fix_archive_tar_pax_headers
...
archive/tar: update to fix writing of PAX headers
Upstream-commit: 1473374a2ad8566c85a00c3fd6f65f6c7ed5a766
Component: engine
2014-07-21 17:26:41 -07:00
0f53a7cb8b
Merge pull request #7146 from dmp42/master
...
Joining registry maintainers
Upstream-commit: b7ff33f73c258d8c2a8ffba8f6abb46114328a58
Component: engine
2014-07-21 17:02:52 -07:00
f24b5ec2fa
Joining registry maintainers
...
Docker-DCO-1.1-Signed-off-by: Olivier Gambier <olivier@docker.com > (github: dmp42)
Upstream-commit: ebc05cbbea55d6a77f1ba159b7df4c4a9c6468f3
Component: engine
2014-07-22 01:50:32 +02:00
07d7985c4e
integration-cli/TestBuildAddTar: embed Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 5d8e80ba8da808fb70d529711359e2d826db2407
Component: engine
2014-07-21 15:02:31 -07:00
dd94d217ed
Merge pull request #6976 from vbatts/vbatts-early_daemon_pidfile
...
docker daemon: initialize the daemon pidfile early
Upstream-commit: d0e2d9ec395f1d00b685bf80ab2431b1d8dce161
Component: engine
2014-07-21 14:26:14 -07:00
0bdbb48e10
Merge pull request #7104 from mheon/sigproxy_docs
...
Update docs on --sig-proxy
Upstream-commit: 61b675d3bb6a645f7f4683253f78f0f9ddfe5a22
Component: engine
2014-07-21 13:42:41 -07:00
597e28c8dd
archive: add a benchmark for TarUntar
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 76429cc11f6e2bd731e9ee77a2a538f15ef80eea
Component: engine
2014-07-21 23:20:32 +03:00
c36c61ebfe
archive: add buffers to operations with tarballs
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: a377844998f6a866d59bf356790f76d0d25bf01f
Component: engine
2014-07-21 23:20:21 +03:00
c5f83694a2
integration-cli/TestBuildAddTar: generate context from test
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 24c00c8508b33de4229280f0be2e7b5761d6ed0e
Component: engine
2014-07-21 13:03:00 -07:00
5d850a0bb6
Resolve merge conflict, attempt 3
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net > (github: soulshake)
Upstream-commit: 319a8a241e0b9182ea309b886e2d23e2f4d73c6c
Component: engine
2014-07-21 12:18:59 -07:00
903a38086f
Merge pull request #7050 from Aigeruth/fix/push_image_layer_registry_content_type
...
Add Content-Type header in PushImageLayerRegistry
Upstream-commit: b752e7402aa635b858c8559ae17080f66816bf92
Component: engine
2014-07-21 15:07:01 -04:00
fabec654d7
Merge pull request #7061 from muchweb/rms
...
Can't believe you forgot RMS
Upstream-commit: 86f20e561f1030e5177f3919394b7b8b7f88a410
Component: engine
2014-07-21 12:02:45 -07:00
41d8a0c6c0
integration-cli: add more tests for BuildAddTar
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 30519330c723374526e7dbfc14807cc8da86c2c0
Component: engine
2014-07-21 11:56:49 -07:00
e2a35d06ac
Merge pull request #7090 from philips/add-philips-to-systemd-maintainers
...
contrib/init/systemd: add philips as MAINTAINER
Upstream-commit: 6dd8eb9520ce63fce34bbd91e7ff625e25aaaef8
Component: engine
2014-07-21 11:41:38 -07:00
9470205eab
Merge pull request #7122 from LK4D4/move_some_run_tests_to_cli
...
Move some run tests to cli
Upstream-commit: e4c79736bfa24379998e6a5262b3e92adf49cbcb
Component: engine
2014-07-21 11:25:36 -07:00
21d78da869
docs/installation/google: update gcloud options
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: e1bb99d925895f4eaec54e7b8254f5250dfeb7dd
Component: engine
2014-07-21 10:55:12 -07:00
15a157c395
Merge pull request #7124 from tianon/travis-compile
...
Adjust Travis to also compile, to test that compilation still succeeds
Upstream-commit: ed92c3f964698c15f613eb04a4d5cdb535563a42
Component: engine
2014-07-21 11:38:15 -06:00
