0ccbdf155d
Extract cgroups utilities to own submodule.
...
Use mountinfo rather than for cgroups parsing.
Make helper method private and change name.
Makes method naming more explicit rather than GetThisCgroup.
Use upstream term subsystem rather than cgroupType.
Upstream-commit: c561212b837735213f146c2fac291f84dbcbc8c3
Component: engine
2014-01-02 17:54:57 -05:00
6beb1be2a4
Merge pull request #3355 from creack/fix_build_exit
...
Exit with code 1 in case of error for `docker build`
Upstream-commit: 907d9ce13c6a7e621ff54fe9d81e4d411031ed33
Component: engine
2013-12-30 22:14:01 -08:00
e2b7c8711c
Merge pull request #3379 from tianon/organize-contrib-syntax
...
Reorganize the syntax highlighting files in contrib under a common directory
Upstream-commit: 74d45789dda863490d81729c954eb1360fdd14fd
Component: engine
2013-12-30 21:57:19 -08:00
7494334ffd
Merge pull request #3392 from tianon/fix-install-failure
...
Fix install failure when busybox can't be downloaded
Upstream-commit: 40522c038053cf90f4035fb52a57003fd8ecf25c
Component: engine
2013-12-30 20:04:30 -08:00
93593cd471
Fixes Issue #3400
...
See Issue #3400
Upstream-commit: ad80da33895aa9f2200279282acc25e4b2bcbf27
Component: engine
2013-12-30 20:58:25 -05:00
6c85a7de88
Merge pull request #3303 from crosbymichael/add-host-flag
...
Add DOCKER_HOST env var for client
Upstream-commit: 1bc3f6b7b5fd8d15df2238fc77f5aeb9624a6582
Component: engine
2013-12-30 15:54:37 -08:00
46e4624179
Merge pull request #3395 from jamtur01/basicsfixes
...
Minor fixes to the basic command documentation
Upstream-commit: 643621133fafc7ea0b479cd636afd1e397055930
Component: engine
2013-12-30 15:41:59 -08:00
4e4ce7a3e6
Merge pull request #3344 from tianon/dockerfile-cleanup
...
Many various Dockerfile cleanups
Upstream-commit: 392b1e99b2ec9c368f81cca99093a406ae3697b9
Component: engine
2013-12-30 11:26:13 -08:00
1a0b6cfa05
Minor fixes to the basic command documentation
...
Upstream-commit: 0dfebf2d93e4990f12ba5d434e1750046008782f
Component: engine
2013-12-30 13:57:11 -05:00
b284ad7fc3
Merge pull request #3394 from jamtur01/clifixes
...
Numerous small fixes to the CLI documentation
Upstream-commit: 40aaebe56ac2de4294baacaa8aa61b20c3b2dabe
Component: engine
2013-12-30 10:56:47 -08:00
70af7e708f
Numerous small fixes to the CLI documentation
...
Upstream-commit: a1dba16fe8562ed0545eaa3c6ed23bb1043dd102
Component: engine
2013-12-30 13:48:12 -05:00
038cb6fc8c
Merge pull request #3371 from Grunny/volumes-typo-fix
...
Fix typo in working with volumes doc page
Upstream-commit: e31f1f1eba498c3ff4073a43533e68bf993cbbcb
Component: engine
2013-12-30 10:35:09 -08:00
09f511f43d
Merge pull request #3312 from DeX77/master
...
Installation for FrugalWare
Upstream-commit: 7e720d0a7797698c393ef2a204c87199463ca1a8
Component: engine
2013-12-30 10:34:39 -08:00
ea65bc7c4b
Merge pull request #3380 from SvenDowideit/add-no-auth-note
...
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
Upstream-commit: 237868e9c3f9d1cb5f5311ef2710f83e1b3b898a
Component: engine
2013-12-30 10:00:51 -08:00
06c747c212
Fix install failure when busybox can't be downloaded
...
Whether or not the "busybox" image downloads and runs properly at the end of the build, we don't want to have the script return a failing exit code, especially since at that point, Docker is successfully installed, and we're just tooting our own horn for good measure.
Upstream-commit: fc197188d7f4098b6035d0e13031431871a2dc95
Component: engine
2013-12-30 08:38:43 -07:00
5ca82c401d
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
...
Upstream-commit: 484a75f3549239d0489cb0ad518d79ed6783584a
Component: engine
2013-12-29 23:27:01 -07:00
c647c27460
fixed header size on narrow desktop window
...
Upstream-commit: 434cf6c8ca5d20306dc27e770155ba05a931adec
Component: engine
2013-12-29 19:22:52 -08:00
5e0630fcf8
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
...
Upstream-commit: e93b7b464733470a08a46b9937678fbfdff0abb0
Component: engine
2013-12-29 21:27:59 +10:00
e302881b24
Reorganize the syntax highlighting files in contrib under a common directory to match "contrib/init" and "contrib/completion"
...
This is split off from #2970 .
Upstream-commit: 06a818616bfce86e90152aeaffaf9394a085c356
Component: engine
2013-12-29 01:46:00 -07:00
87ba43c927
Add DOCKER_HOST env var for client
...
This env var will set the -H flag on the docker
client.
Upstream-commit: f50b8b08b5742c8e55df2d610d428c39cf1f4947
Component: engine
2013-12-28 16:42:18 -08:00
a3a982cef5
Fix typo in working with volumes doc page
...
Upstream-commit: a17fd7b294e1334788e1812f8cc1a99e5300724b
Component: engine
2013-12-28 20:22:46 +10:00
0cd52002c8
* s/docker/Docker/
...
Upstream-commit: d256f3049b36ae1a1dd596535b4a82d265ff9eee
Component: engine
2013-12-27 11:55:57 +01:00
1bab794e11
Apply automatically to files named 'Dockerfile'
...
Upstream-commit: a1a4a99d7e80cadb97bf58963b76cd0c762888a6
Component: engine
2013-12-27 10:05:25 +01:00
63c010af99
Exit with code 1 in case of error for docker build
...
Upstream-commit: 4986958e7e61bb0439a59c46af000b157798b94a
Component: engine
2013-12-26 17:49:41 -08:00
93558ee08f
Merge pull request #3343 from bwiklund/comment-edits
...
small batch of edits/corrections to comments
Upstream-commit: 808f2d39bde6884f299d72097ed28604e27c9cbb
Component: engine
2013-12-26 10:22:33 -08:00
372a1c9fdf
Merge pull request #3347 from smarterclayton/patch-1
...
Fix typo in devmapper error message
Upstream-commit: d1ca12e81b1fc35e5ac1986439a85feaa9237a9d
Component: engine
2013-12-26 10:19:55 -08:00
1a7338c423
Document "name" query parameter for "POST /containers/create" in Remote API v1.8
...
Upstream-commit: 721bb410f6caa213b7d4eed9373be74287605ffc
Component: engine
2013-12-26 06:43:26 +01:00
010169891e
Fix typo in devmapper error message
...
Upstream-commit: 029625981d3872872f0de95c5a4ea68cb1fa93af
Component: engine
2013-12-25 15:49:58 -05:00
044c307631
small batch of edits/corrections to comments
...
Upstream-commit: 0fccf0f68655fd01973e4c00bbb063fad1bce56c
Component: engine
2013-12-24 16:40:14 -08:00
e297baa1c0
Merge pull request #2809 from graydon/880-cache-ADD-commands-in-dockerfiles
...
Issue #880 - cache ADD commands in dockerfiles
Upstream-commit: efaf2cac5c8d54a5098f7036e738e1f919f84452
Component: engine
2013-12-24 16:22:51 -08:00
a35b7b892f
Merge pull request #3337 from tianon/release-darwin
...
Release tgz and binaries for cross-compiled platforms
Upstream-commit: cb1fe939a88af2c254a5c13a4a11aafea2fd08dd
Component: engine
2013-12-24 14:44:41 -08:00
4fb94b472a
Fixed #3039 - Added clarify on port options in API
...
Upstream-commit: d2d8a4a6c507bc8e7d591925276d79d89ce6beaf
Component: engine
2013-12-24 13:01:59 -05:00
7db2296200
Update cross and tgz to play nicely together (creating a tgz for each supported OS/ARCH), and update release.sh to upload binaries and tgz files for all the supported OS/ARCH combos
...
Upstream-commit: 4100e9b7df5cbce855b47b3625d34c9667e40dc1
Component: engine
2013-12-23 23:55:06 -07:00
cc04ab4930
Merge pull request #3112 from shawnl/master
...
hack/PACKAGERS.md: libdevmapper
Upstream-commit: 5875953d9be0bf3339185dd6b5c4b1e185eb85b6
Component: engine
2013-12-23 19:24:36 -08:00
db38486199
Merge pull request #3318 from sugi/mkimage-deb-fix-cache-glob
...
Fix glob expansion on mkimage-debootstrap
Upstream-commit: f4ce106e02cb917532f5686dc1fcd7fe34a15e0a
Component: engine
2013-12-23 17:20:41 -08:00
26d6511511
Merge pull request #3324 from roylee17/enhance-docker-top-err-msg
...
docker-top: improve error message for non-running containers
Upstream-commit: 7ec1236cee1323afaa4c5dd95130b6e81d172f26
Component: engine
2013-12-23 17:15:37 -08:00
7878ada020
Merge pull request #3327 from shykes/pkg-graphdb
...
Move utility package 'graphdb' to pkg/graphdb
Upstream-commit: 2b4bb67ce00a2202c01e0bfbfd34ea08e6c1a923
Component: engine
2013-12-23 16:33:11 -08:00
255f0587df
Merge pull request #3331 from shykes/pkg-names
...
Move utility package 'namesgenerator' to pkg/namesgenerator
Upstream-commit: 6155f07561d74aac30f6935375251811ea8c4153
Component: engine
2013-12-23 16:15:26 -08:00
53605d721c
Merge pull request #3330 from shykes/pkg-term
...
Move utility package 'term' to pkg/term
Upstream-commit: e6e35e598426d82b43200112269005cdffbbfdc0
Component: engine
2013-12-23 16:11:42 -08:00
cea3b92c30
Merge pull request #3329 from shykes/pkg-netlink
...
Move utility package 'netlink' to pkg/netlink
Upstream-commit: 0d207abf8ef1c5a18dddd12329f4bc0ed8f4aee6
Component: engine
2013-12-23 16:08:07 -08:00
a4e77f8375
Move utility package 'namesgenerator' to pkg/namesgenerator
...
Upstream-commit: a009d4ae8d67b40c0109865f4d83e6e294931ce7
Component: engine
2013-12-23 23:45:18 +00:00
5587d7db10
Merge pull request #3304 from vieux/prevent_orphan_deletion
...
Prevent orphan in docker rmi
Upstream-commit: b75f385abda358fe6bdb3516da4423bd72a2b253
Component: engine
2013-12-23 15:44:46 -08:00
a481c1b450
Move utility package 'term' to pkg/term
...
Upstream-commit: 7ce7516c12f58aa71cd055b7c0bef6585d3f2ab3
Component: engine
2013-12-23 23:42:37 +00:00
e7204ea88e
Move utility package 'netlink' to pkg/netlink
...
Upstream-commit: f6b91262a77b2e70da8572850dd8b56d92384dfe
Component: engine
2013-12-23 23:39:39 +00:00
10227320c8
Move utility package 'graphdb' to pkg/graphdb
...
Upstream-commit: d16d748132330ff58e142472a579d1f6c65e3eac
Component: engine
2013-12-23 23:33:06 +00:00
8e046abf73
Merge pull request #3325 from shykes/pkg-systemd
...
Move utility package 'systemd' to pkg/systemd
Upstream-commit: 3fc9de3d0396d15f7310910a86100257853cdd90
Component: engine
2013-12-23 15:26:25 -08:00
3df2c5ea87
Add README to pkg
...
Upstream-commit: 652c2c2a80cd119ffb8017c25e741ddad9399236
Component: engine
2013-12-23 23:12:19 +00:00
60759a8d1a
Move utility package 'systemd' to pkg/systemd
...
Upstream-commit: 8e7db0432e21adb3a753188d5321ce1165fa8964
Component: engine
2013-12-23 23:07:01 +00:00
54063489be
Merge pull request #3309 from apocas/master
...
Wrong HTTP method in events endpoint. (documentation)
Upstream-commit: e1a15b25dc39049c9dc7ded3042422460155ed60
Component: engine
2013-12-23 14:58:49 -08:00
c952ec0ff7
docker-top: improve error message for non-running containers
...
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com >
Upstream-commit: b1a3a5580285b58d643ff0c09c263f78d1088f37
Component: engine
2013-12-23 14:50:24 -08:00
