p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,055 Commits 2 Branches 295 Tags
1c550a00a4f22477ea768229df8d04a22f7fb998
Commit Graph

216 Commits

Author SHA1 Message Date
Victor Vieux
d6e39e4b66 Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
 2014-03-19 22:03:11 +00:00
Michael Crosby
c9b7a0a568 Merge pull request #4744 from LK4D4/fix_issue_#3565 
Using names in docker ps --since-id/--before-id, resolves #3565
Upstream-commit: 22c18de7bed169792213843476d06dedbd1ba387
Component: engine
 2014-03-18 15:39:56 -07:00
Brian Goff
463aedf3de Add upstart nofile/noproc similar to systemd init 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: e27c635c06dcad61ce7185d95debef9ef7c9f7e0
Component: engine
 2014-03-18 16:27:20 -04:00
LK4D4
5ac53676ce Using names in docker ps --since-id/--before-id, resolves #3565 
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: c1f2abd89958a8731211ceb2885eed238a3bea8d
Component: engine
 2014-03-18 23:30:21 +04:00
Michael Crosby
742b723fc2 Move graphdrivers into runtime top level pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 96c4816cef592a98a235010924bb2417c8451079
Component: engine
 2014-03-17 11:40:12 -07:00
Tianon Gravi
c48adc6929 Update to double-dash everywhere 
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 44fe8cbbd174b5d85d4a063ed270f6b9d2279b70
Component: engine
 2014-03-13 11:46:02 -06:00
Tianon Gravi
c9483fdf18 Merge pull request #4574 from tianon/fix-cgroup-hax 
Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount...
Upstream-commit: f544ebd55aee0944f0b0ca03b2edd90eac312e4a
Component: engine
 2014-03-11 22:21:01 -06:00
Tianon Gravi
b4c989ed6d Add variable for DOCKER_LOGFILE to sysvinit and use append instead of overwrite in opening the logfile 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 76dc670f413de64361a8bb3efa3381331e796b21
Component: engine
 2014-03-11 01:40:31 -06:00
Tianon Gravi
be15eebe0b Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount and thus work properly 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: b21f8872cc684c95a2e30cec9f7c744a78a819f8
Component: engine
 2014-03-11 01:39:06 -06:00
Guillaume J. Charmes
84def4f523 Update email + add self to pkg/signal 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 915d967f556bc7bb3faea34db8a06ea64fd5de92
Component: engine
 2014-03-10 20:26:45 -07:00
Tianon Gravi
a185dfcddd Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 50082f792be22b97dcc79afe666289ecefbc3864
Component: engine
 2014-03-10 03:27:46 -06:00
Johannes 'fish' Ziemke
46c0bc2613 Add authenticated TLS support for API 
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: c000cb64712349141596318dea2a8de2462c8f81
Component: engine
 2014-03-09 00:06:44 +01:00
unclejack
063107f17f upgrade packages after debootstrap 
This makes mkimage-debootstrap upgrade packages after retrieving
updated lists of packages.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: d04f4d836c6b2a9266350a1b0e284949dcc6510a
Component: engine
 2014-03-08 18:41:50 +02:00
Lokesh Mandvekar
ecc13ba924 bump open files and procs limit via unitfile 
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com> (github: lsm5)

	modified:   contrib/init/systemd/docker.service
	modified:   contrib/init/systemd/socket-activation/docker.service
Upstream-commit: 291d5e642e83ca84bd4f9b470eac8f840fecf48c
Component: engine
 2014-03-04 22:29:51 -05:00
Sven Dowideit
207b929d4d nope, echo -e isn't portable 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 4f29836f7158521f31e42ea6dfde6c19cd069715
Component: engine
 2014-03-04 10:40:36 +10:00
Sven Dowideit
ba4d7c0ac6 it seems on MSWindows MSYS bash, echo n puts a literal \n (not a newline) into the commit message, so lets get more primitive 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 43feb84203d5c0ca3b2cb110a96b3dd0ec3a93df
Component: engine
 2014-03-04 10:08:40 +10:00
Tianon Gravi
1a36965b0f Merge pull request #4399 from barnybug/fish-completions 
Add fish shell completions from github.com/barnybug/docker-fish-completion
Upstream-commit: 10137a561c280cd9ba36ffb62bb7696989f4072c
Component: engine
 2014-03-02 08:45:09 -07:00
Lewis Peckover
ccaab9867b mkdir /dev before doing mknod 
Docker-DCO-1.1-Signed-off-by: Lewis Peckover <lew@lew.io> (github: lewispeckover)
Upstream-commit: 6d55a9d7ceec7f9c114839f9c380321a93291aa5
Component: engine
 2014-03-02 14:50:16 +00:00
Barnaby Gray
197f474b34 Add fish shell completions from https://github.com/barnybug/docker-fish-completion. 
Docker-DCO-1.1-Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk> (github: barnybug)
Upstream-commit: bf6adf952b573d10d5e2eb1a08e382ea6182a5d0
Component: engine
 2014-03-01 17:33:54 +00:00
Tim Bosse
906ee51aec Some distributions no longer include MAKEDEV script. Stole this from mkimage-rinse.sh. 
Docker-DCO-1.1-Signed-off-by: Tim Bosse <taim@bosboot.org> (github: maztaim)
Upstream-commit: 1d82091756a7e5514619ecd676ceaa89acabedef
Component: engine
 2014-02-26 22:34:42 -05:00
Tianon Gravi
7413b7bf4d Update mkimage-yum to not read /etc/redhat-release from the host 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d29ee876ac7900730e1f48f4f30ed33210872238
Component: engine
 2014-02-25 23:35:59 -07:00
Tianon Gravi
5201e26b23 Merge pull request #4296 from morgante/patch-1 
Remove trailing slash from --host parameter in contrib/vagrant-docker/README.md
Upstream-commit: b5517db808ef38e4ba3c1303affe110c0784af07
Component: engine
 2014-02-24 16:27:31 -07:00
Tianon Gravi
48edd91d26 Add "SteamOS" support to mkimage-debootstrap (requires a debootstrap script like https://github.com/tianon/gentoo-overlay/blob/master/dev-util/debootstrap-valve/files/scripts/alchemist) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: cd94c9d66693253ce71d8c691cb937980dd96565
Component: engine
 2014-02-24 12:55:04 -07:00
Morgante Pell
afb31c48bd Remove trailing slash from host parameter in docker init. 
(This causes errors on Docker 0.8)

Docker-DCO-1.1-Signed-off-by: Morgante Pell <morgante.pell@morgante.net> (github: morgante)
Upstream-commit: 2a7f7c86da00210cb90eafd77ee01354f98ec4fc
Component: engine
 2014-02-23 23:42:54 +04:00
Tianon Gravi
45e14307e8 Merge pull request #4246 from Ximion/master 
contrib/debootstrap: Add initial support for Tanglu
Upstream-commit: ed8466c44c93a523176022df118760bc1a359801
Component: engine
 2014-02-22 14:58:14 -07:00
Matthias Klumpp
6253b6b7aa contrib/debootstrap: Add initial support for Tanglu 
This will add support for Tanglu, a Debian based Linux-distribution.

Docker-DCO-1.1-Signed-off-by: Matthias Klumpp <matthias@tenstral.net> (github: Ximion)
Upstream-commit: 4bfc8e97222b8908176d2420060bbeae613a571c
Component: engine
 2014-02-22 17:25:52 +01:00
unclejack
0802cd5e0f don't skip cert check for an example & use HTTPS 
This changes two URLs from http to https and it fixes a Dockerfile to
stop skipping certificate validation. It also adds the ca-certificates
package to that Dockerfile example.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 73a277eb2fd66b815b11e9d2caff2c31c18a0854
Component: engine
 2014-02-20 01:11:04 +02:00
unclejack
677b80e93f Merge pull request #4010 from tianon/iceweasel 
Swap Firefox to Iceweasel so that the Desktop Integration example is simplified and easier to understand
Upstream-commit: 23aec9d7fcaa72db026c042046102b381e2e9d27
Component: engine
 2014-02-14 21:38:40 +02:00
Tianon Gravi
8158393ebb Merge pull request #4093 from stpierre/mkimage-yum 
Fix bogus variable reference in mkimage-yum.sh
Upstream-commit: cc144418456d9c93b80e291e3f24750a41658665
Component: engine
 2014-02-13 15:28:47 -07:00
Adam Miller
f734c53533 remove unneeded sysctl changes in sysvinit-redhat init script 
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com> (github: maxamillion)
Upstream-commit: 4317011e21b4e4025a9c92c7dc255fbf62af573a
Component: engine
 2014-02-13 12:11:38 -06:00
Adam Miller
536d661ab7 Merge branch 'master' into maxamillion/add_redhat_sysvinit 
* master: (64 commits)
  Move the canonical run configuration objects to a sub-package
  Remove useless code in client implementation of 'run'.
  pkg/opts: a collection of custom value parsers implementing flag.Value
  Move api-specific code to the api package
  Fix the tests, too
  Fix the one spot I missed dockerversion
  fix underline/heading
  New package `nat`: utilities for manipulating the text description of network ports.
  rewrite the PostgreSQL example using a Dockerfile, and add details to it
  Move even more stuff into dockerversion
  fix underline/heading
  Move docker version introspection to a sub-package.
  add port forwarding notes for mac/boot2docker docs
  Update remote_api_client_libraries.rst
  Avoid extra mount/unmount during container registration
  add a little more information about the docker run -P option
  lxc: Drop NET_ADMIN capability in non-privileged containers
  devmapper: Remove directory when removing devicemapper device
  add a little info on upgrading
  point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
  ...
Upstream-commit: e36d4d88219192269599c7273bcba4f5fcf0fb4e
Component: engine
 2014-02-12 12:04:02 -06:00
Adam Miller
b2a134f727 Added sysvinit/sysconfig files for redhat family of distros (RHEL/CentOS/SL/etc.) 
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com> (github: maxamillion)
Upstream-commit: 2222cba5acd3fe663d492d7bc3fd4787d4c9869f
Component: engine
 2014-02-12 12:03:32 -06:00
Chris St. Pierre
8f6a38f17a Fix bogus variable reference in mkimage-yum.sh 
Fixes this: d419da7227 (commitcomment-5344982)

Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
Upstream-commit: 85263cdee894d1f1e3bca21a8d18264ef530c4d5
Component: engine
 2014-02-12 08:02:36 -05:00
Tianon Gravi
31b1c10e09 Swap Firefox to Iceweasel so that the Desktop Integration example is simplified and easier to understand 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 72c72f91c621d9dd2431eee01a28a4ca490588bc
Component: engine
 2014-02-08 11:34:11 -07:00
German DZ
1097b506cc Instructions for Textmate's bundle installation 
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
Upstream-commit: ac06646b1fb7172937c52d5f1217dcac5a86f0f9
Component: engine
 2014-02-07 09:30:11 +01:00
German DZ
4f66485afb New folder structure to support TextMate2 bundles format 
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
Upstream-commit: f289b3a19e03b99a6618009320abaec2c0cf1ec1
Component: engine
 2014-02-07 09:29:14 +01:00
Tianon Gravi
e004860fa8 Merge pull request #3966 from asbjornenge/updated_tmlang 
Update TextMate & Sublime Text Syntaxt Highlighting with ONBUILD
Upstream-commit: 84285f7539f5825db62df3e3995d3de7b96b0a89
Component: engine
 2014-02-06 14:20:52 -07:00
Asbjørn Enge
b27e52cf64 Added support for single quoted strings 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: f6c6f303f84773987afd5f83d9c1e2170fa140e3
Component: engine
 2014-02-06 20:50:36 +01:00
Asbjørn Enge
f652ab5b5e Improved regex 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 888e8da2832871b10f60ba9d3058fc442812ca17
Component: engine
 2014-02-06 20:48:15 +01:00
Asbjørn Enge
169c246340 Updated readme 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 3d86f07f8776fd97f1f75e99ad535a9b6543059a
Component: engine
 2014-02-06 20:38:25 +01:00
Asbjørn Enge
94f2865699 Added suppport for the ONBUILD instruction 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 647db3938d27d832d09f622b304c7bd23bc00d74
Component: engine
 2014-02-06 20:38:20 +01:00
Asbjørn Enge
a0b0e2b023 Removed the YAML file since I wasn't using it 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: e95bb0b4a9ef642d02f5549ba8375f9952eff0b3
Component: engine
 2014-02-06 20:37:49 +01:00
Asbjørn Enge
8a1a839738 Added Dockerfile.tmPreferences for hotkey commenting 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 6561d65438ed2e10143a5a8bac32bf62d5d8950d
Component: engine
 2014-02-06 20:35:45 +01:00
Tianon Gravi
fc2d4abd37 Add "ONBUILD" highlighting to our vim syntax file 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e634f2394085d5dc7e716553b330acb8694bf6d3
Component: engine
 2014-02-06 11:12:57 -07:00
Samuel Andaya
19172f19fc Update mkimage-arch.sh 
mktemp creates a root directory ("/") with permissions set to 700. Default should be 755 so other users in the container can access its subdirs (e.g http user for nginx for /srv/http/test/index.html).

Docker-DCO-1.1-Signed-off-by: Samuel Andaya <samuel@andaya.net> (github: sandaya)
Upstream-commit: 736bf3f7e6ae4a80cc85c846a4d5d074a325c9f4
Component: engine
 2014-02-03 21:26:47 -05:00
Brandon Philips
0e8d28d6ec contrib: systemd: make socket-activation Restart=always 
Do as was done to f09a78cd219b24d4308034c8dd13410cfe5fbec7 in the
socket-activation example.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 4dab34c2045b7bcc735227867126f0796cbb09c1
Component: engine
 2014-01-29 17:42:32 -08:00
Tianon Gravi
805774b4d2 Merge pull request #3531 from lsm5/docker-systemd 
ExecStartPre commands updated in systemd service file
Upstream-commit: de8480f6567778516a371fa8405df0409181cc32
Component: engine
 2014-01-29 17:38:10 -08:00
Tianon Gravi
0a0316537a Merge pull request #3734 from stpierre/mkimage-yum 
Added new mkimage-yum.sh script to create CentOS base images
Upstream-commit: 95dff84728493ff8d5ac2805473686afb70323f3
Component: engine
 2014-01-29 14:52:51 -08:00
Tianon Gravi
86c10c5a7d Merge pull request #3588 from tianon/debootstrap-tweaks 
Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
Upstream-commit: e1b210bee95b894c21f74f1df0efdfe0d6e93c56
Component: engine
 2014-01-29 08:42:14 -08:00
Lokesh Mandvekar
667c92d38b remove ip fowarding from systemd (fixed: commit #3801) 
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com> (github: lsm5)
Upstream-commit: a9d0bbcfc6e45817f39f15a7c9b11305b4c04bad
Component: engine
 2014-01-29 11:06:23 -05:00