Johannes 'fish' Ziemke
c000cb6471
Add authenticated TLS support for API
...
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
2014-03-09 00:06:44 +01:00
unclejack
d04f4d836c
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)
2014-03-08 18:41:50 +02:00
Lokesh Mandvekar
291d5e642e
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
2014-03-04 22:29:51 -05:00
Sven Dowideit
4f29836f71
nope, echo -e isn't portable
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-03-04 10:40:36 +10:00
Sven Dowideit
43feb84203
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)
2014-03-04 10:08:40 +10:00
Tianon Gravi
10137a561c
Merge pull request #4399 from barnybug/fish-completions
...
Add fish shell completions from github.com/barnybug/docker-fish-completion
2014-03-02 08:45:09 -07:00
Lewis Peckover
6d55a9d7ce
mkdir /dev before doing mknod
...
Docker-DCO-1.1-Signed-off-by: Lewis Peckover <lew@lew.io> (github: lewispeckover)
2014-03-02 14:50:16 +00:00
Barnaby Gray
bf6adf952b
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)
2014-03-01 17:33:54 +00:00
Tim Bosse
1d82091756
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)
2014-02-26 22:34:42 -05:00
Tianon Gravi
d29ee876ac
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)
2014-02-25 23:35:59 -07:00
Tianon Gravi
b5517db808
Merge pull request #4296 from morgante/patch-1
...
Remove trailing slash from --host parameter in contrib/vagrant-docker/README.md
2014-02-24 16:27:31 -07:00
Tianon Gravi
cd94c9d666
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)
2014-02-24 12:55:04 -07:00
Morgante Pell
2a7f7c86da
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)
2014-02-23 23:42:54 +04:00
Tianon Gravi
ed8466c44c
Merge pull request #4246 from Ximion/master
...
contrib/debootstrap: Add initial support for Tanglu
2014-02-22 14:58:14 -07:00
Matthias Klumpp
4bfc8e9722
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)
2014-02-22 17:25:52 +01:00
unclejack
73a277eb2f
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)
2014-02-20 01:11:04 +02:00
unclejack
23aec9d7fc
Merge pull request #4010 from tianon/iceweasel
...
Swap Firefox to Iceweasel so that the Desktop Integration example is simplified and easier to understand
2014-02-14 21:38:40 +02:00
Tianon Gravi
cc14441845
Merge pull request #4093 from stpierre/mkimage-yum
...
Fix bogus variable reference in mkimage-yum.sh
2014-02-13 15:28:47 -07:00
Adam Miller
4317011e21
remove unneeded sysctl changes in sysvinit-redhat init script
...
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com> (github: maxamillion)
2014-02-13 12:11:38 -06:00
Adam Miller
e36d4d8821
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
...
2014-02-12 12:04:02 -06:00
Adam Miller
2222cba5ac
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)
2014-02-12 12:03:32 -06:00
Chris St. Pierre
85263cdee8
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)
2014-02-12 08:02:36 -05:00
Tianon Gravi
72c72f91c6
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)
2014-02-08 11:34:11 -07:00
German DZ
ac06646b1f
Instructions for Textmate's bundle installation
...
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
2014-02-07 09:30:11 +01:00
German DZ
f289b3a19e
New folder structure to support TextMate2 bundles format
...
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
2014-02-07 09:29:14 +01:00
Tianon Gravi
84285f7539
Merge pull request #3966 from asbjornenge/updated_tmlang
...
Update TextMate & Sublime Text Syntaxt Highlighting with ONBUILD
2014-02-06 14:20:52 -07:00
Asbjørn Enge
f6c6f303f8
Added support for single quoted strings
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2014-02-06 20:50:36 +01:00
Asbjørn Enge
888e8da283
Improved regex
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2014-02-06 20:48:15 +01:00
Asbjørn Enge
3d86f07f87
Updated readme
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2014-02-06 20:38:25 +01:00
Asbjørn Enge
647db3938d
Added suppport for the ONBUILD instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2014-02-06 20:38:20 +01:00
Asbjørn Enge
e95bb0b4a9
Removed the YAML file since I wasn't using it
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2014-02-06 20:37:49 +01:00
Asbjørn Enge
6561d65438
Added Dockerfile.tmPreferences for hotkey commenting
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2014-02-06 20:35:45 +01:00
Tianon Gravi
e634f23940
Add "ONBUILD" highlighting to our vim syntax file
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-06 11:12:57 -07:00
Samuel Andaya
736bf3f7e6
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)
2014-02-03 21:26:47 -05:00
Brandon Philips
4dab34c204
contrib: systemd: make socket-activation Restart=always
...
Do as was done to f09a78cd21
in the
socket-activation example.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-01-29 17:42:32 -08:00
Tianon Gravi
de8480f656
Merge pull request #3531 from lsm5/docker-systemd
...
ExecStartPre commands updated in systemd service file
2014-01-29 17:38:10 -08:00
Tianon Gravi
95dff84728
Merge pull request #3734 from stpierre/mkimage-yum
...
Added new mkimage-yum.sh script to create CentOS base images
2014-01-29 14:52:51 -08:00
Tianon Gravi
e1b210bee9
Merge pull request #3588 from tianon/debootstrap-tweaks
...
Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
2014-01-29 08:42:14 -08:00
Lokesh Mandvekar
a9d0bbcfc6
remove ip fowarding from systemd (fixed: commit #3801 )
...
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com> (github: lsm5)
2014-01-29 11:06:23 -05:00
Lokesh Mandvekar
f09a78cd21
ExecStartPre commands updated
...
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com> (github: lsm5)
systemd service no longer does '/bin/mount/ --make-rprivate /'.
Core issue fixed by Alex Larsson (commit 157d99a
).
ip forwarding enabled.
2014-01-29 11:06:23 -05:00
Brandon Philips
1f44921c51
fix(contrib/init/systemd): remove mount rprivate
...
Docker does this now via 157d99a727
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
7f9d3268bf
Allow fd:// like unix:// and tcp://
...
Somthing like 20605eb310
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-01-27 17:18:09 -08:00
Brandon Philips
87fb2c973d
server: add socket activation
...
This adds the ability to socket activate docker by passing in
`-H fd://*` along with examples systemd configuration files.
The fastest way to test this is to run:
```
/usr/lib/systemd/systemd-activate -l 127.0.0.1:2001 /usr/bin/docker -d -H 'fd://*'
docker -H tcp://127.0.0.1:2001 ps
```
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-01-27 17:17:07 -08:00
Andy Rothfusz
bbfc531b51
Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg
...
move the contributing hook into contrib, and use curl in the same way as the gofmt above
2014-01-27 12:09:03 -08:00
Chris St. Pierre
fd2403b830
fix shebang in mkimage-yum.sh
...
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
2014-01-23 12:01:24 -05:00
Chris St. Pierre
d419da7227
Added new mkimage-yum.sh script to create CentOS base images
...
mkimage-rinse.sh requires rinse, which is not readily available on
CentOS or Fedora. Plus, creating a base image is trivial with yum
alone.
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
2014-01-23 07:09:44 -05:00
James Mills
d247b7d426
Added script for building Base Docker CRUX images
...
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au> (github: therealprologic)
2014-01-23 13:53:19 +10:00
Sven Dowideit
7c55cbd4c9
move the contributing hook into hack, and use curl in the same way as the gofmt above
...
and remove the fmt-check one we don't document
tianon tells me they're called GitHub, not Github :)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-01-22 21:31:42 +10:00
Tianon Gravi
572002a715
Merge pull request #3707 from bkcsoft/fix-bash-hashbangs
...
Update bash shebangs to use "/usr/bin/env bash" for increased portability
2014-01-21 17:30:52 -08:00
Kim BKC Carlbacker
b1953baba2
This should make all bash-scripts run on pretty much any posix-system (with bash installed ofc...)
...
Docker-DCO-1.1-Signed-off-by: Kim BKC Carlbacker <kim.carlbacker@gmail.com> (github: bkcsoft)
2014-01-22 02:21:56 +01:00
Tianon Gravi
678d76fa9c
Merge pull request #3671 from tianon/completion-ignore-stderr
...
Update bash completion to ignore stderr output of docker binary
2014-01-21 10:40:23 -08:00
Tianon Gravi
b23e6e99b3
Merge pull request #3459 from Barthalion/master
...
Fix mkimage-arch.sh to generate cleaner Arch Linux images and do so with cleaner code
2014-01-21 07:11:57 -08:00
Bartłomiej Piotrowski
4137a0ea32
mkimage-arch: provide and use own pacman.conf
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
2014-01-21 14:22:56 +01:00
Bartłomiej Piotrowski
787ff55283
mkimage-arch: use hash to check if command is available
...
Apart from having more predictable return codes on various operating
systems, it additionally caches the path to application.
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
2014-01-21 14:22:47 +01:00
Bartłomiej Piotrowski
da4ba80733
mkimage-arch: don't generate ISO-8859-1 locale
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
2014-01-21 14:22:39 +01:00
Bartłomiej Piotrowski
c6535d272c
mkimage-arch: unify usage of brackets around variables
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
2014-01-21 14:22:33 +01:00
Bartłomiej Piotrowski
a4e6e9bd41
mkimage-arch: remove $DEV instead of renaming it
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
2014-01-21 14:22:26 +01:00
Bartłomiej Piotrowski
c138c335a5
mkimage-arch: use mktemp to create ROOTFS directory
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
2014-01-21 14:21:43 +01:00
Tianon Gravi
9152aab653
Update bash completion to ignore stderr output of docker binary
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-20 01:26:01 -07:00
Tianon Gravi
fb981bdace
Switch `docker run --username` to `docker run --user` which is more accurate (while we can still do so without breaking anyone's scripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-20 00:28:55 -07:00
Tianon Gravi
c6e43154f1
Resync bash completion to include all flags defined in the code, and to autocomplete properly on all parameters that are reasonably possible to do so on today
...
This also includes several new minor features that are interesting, so do explore a little. :)
Finally, this also fixes a few bugs where commands would complete parameters that they won't necessarily accept. We still have a few of these cases, but they're reduced to a minimum now.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-20 00:28:55 -07:00
Victor Vieux
e71dbf4ee5
update commands.go
...
update docker.go
move to pkg
update docs
update name and copyright
change --sinceId to --since-id, update completion and docs
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
2014-01-17 17:33:15 -08:00
Tianon Gravi
dbf249e239
Merge pull request #3508 from tutumcloud/seccomp
...
Add capabilities needed by new sysinit to mkseccomp.pl sample list
2014-01-14 18:55:53 -08:00
Fernando
32565a4451
added capabilities needed by new sysinit
...
Docker-DCO-1.1-Signed-off-by: Fernando Mayo <fernando@tutum.co> (github: fermayo)
2014-01-14 19:27:31 +01:00
Tianon Gravi
5a3fa3c901
Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 04:20:27 -07:00
Tianon Gravi
e525ad3f9b
Fix a few miscellaneous typos (Unkown -> Unknown, Recieve -> Receive)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-07 22:15:53 -07:00
Tianon Gravi
c23b15b9d8
Merge pull request #3398 from thomasleveil/bash_completion_names
...
support for container names in bash completion
2013-12-31 08:28:21 -08:00
Thomas LEVEIL
055b32e3f4
support for container names in bash completion
2013-12-31 11:34:23 +00:00
Tianon Gravi
06a818616b
Reorganize the syntax highlighting files in contrib under a common directory to match "contrib/init" and "contrib/completion"
...
This is split off from #2970 .
2013-12-29 01:46:00 -07:00
Asbjørn Enge
a1a4a99d7e
Apply automatically to files named 'Dockerfile'
2013-12-27 10:05:25 +01:00
Tatsuki Sugiura
e3b878ce98
Fix glob expansion for no-cache setting.
...
On previous version, glob pattern will be expanded to actual file
names when writing setting to etc/apt/apt.conf.d/no-cache.
This patch fixes to quote to work cache clean command properly.
2013-12-23 17:27:22 +09:00
Tianon Gravi
606cacdca0
Merge pull request #3222 from gurjeet/zfs_driver_owner
...
Update readme to mark ZFS driver as Alpha quality.
2013-12-15 07:09:00 -08:00
Gurjeet Singh
d526038503
Update readme to mark ZFS driver as Alpha quality.
2013-12-15 09:17:16 -05:00
Tianon Gravi
78b85220be
Update mkimage-debootstrap with even more tweaks for keeping images tiny by more aggressively removing cache files and by not downloading apt-cache Translations files
2013-12-10 10:59:32 -07:00
Tianon Gravi
584164177e
Merge pull request #2358 from tianon/mkimage-rinse
...
Remove mkimage-centos.sh in favor of a new rinse-based script...
2013-12-05 16:07:59 -08:00
Tianon Gravi
2acea6090f
Merge pull request #2983 from tianon/udev
...
Add udev rules files for hiding the docker loopback devices from udisks
2013-12-05 16:01:04 -08:00
Tianon Gravi
650d4cc644
Merge pull request #3005 from gurjeet/zfs_driver_owner
...
Typo fix
2013-12-02 15:06:05 -08:00
Gurjeet Singh
d9b742419c
Typo fix
2013-12-02 18:03:54 -05:00
Tianon Gravi
9d62dc1a08
Remove mkimage-centos.sh in favor of a new rinse-based script, since febootstrap is fragile and picky
2013-12-02 14:54:04 -07:00
Tianon Gravi
d9fbdd7b3f
Merge pull request #2995 from gurjeet/zfs_driver_owner
...
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
2013-12-02 11:10:16 -08:00
Gurjeet Singh
70b586702c
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
2013-12-02 14:03:16 -05:00
Tianon Gravi
dbb47f63ab
Add udev rules files for hiding the docker loopback devices from udisks
...
This prevents them from showing up on the desktop in a window manager, for example.
2013-12-02 09:11:06 -07:00
Solomon Hykes
d8ee08ba7b
Merge pull request #2925 from tianon/update-systemd-service
...
Update systemd service file with suggestions from @seblu
2013-11-29 21:25:08 -08:00
Ulysse Carion
c226ab6d9e
Document setting up Vagrant-docker with the remote API
2013-11-27 20:05:54 -08:00
Tianon Gravi
75e9cff98c
Update systemd service file with suggestions from @seblu
2013-11-27 16:55:37 -07:00
Martijn van Oosterhout
ab3a83c617
Add mkseccomp.pl, helper script to make seccomp profiles.
2013-11-26 17:13:02 +01:00
Guillaume J. Charmes
3e0a5ac48b
Merge pull request #41 from alexlarsson/dm-plugin-device-tool
...
Update docker-device-tool
2013-11-19 15:38:47 -08:00
Alexander Larsson
9415c2b1f0
Move docker-device-tool to contrib
2013-11-19 10:03:04 +01:00
Justin Plock
0e64b987e8
Fix images not being properly tagged
2013-11-16 11:05:38 -05:00
Tianon Gravi
b94e9ed0de
Merge pull request #2652 from tianon/upstart-defaults-too
...
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
2013-11-13 10:42:41 -08:00
Andy Rothfusz
cb9e0aee48
Merge pull request #2646 from fgrehm/contrib-vagrant
...
Update contrib/vagrant-docker with projects available
2013-11-11 13:49:15 -08:00
Tianon Gravi
88edba7e86
Update upstart check in sysvinit to be exactly the same as the init_is_upstart function from /lib/lsb/init-functions (which isn't available in 12.04 or we'd use it directly)
2013-11-11 11:57:25 -07:00
Tianon Gravi
7cf7dda87d
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
2013-11-11 11:13:16 -07:00
Tianon Gravi
bb76157d24
Fix sysvinit upstart detection and give it a pretty message
2013-11-11 11:10:19 -07:00
Fabio Rehm
9c7a8edddd
Update contrib/vagrant-docker with projects available
2013-11-11 13:36:44 -02:00
Daniel Mizyrycki
5af87d1475
contrib: Desktop integration. Firefox usecase.
2013-11-05 13:21:52 -08:00
Victor Vieux
a482bfd715
Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
...
Update docker search to reflect future changes of the api
2013-11-04 16:14:14 -08:00
Tianon Gravi
8ad46ef401
Merge pull request #2365 from tianon/sysvinit-consistency
...
Update sysvinit script to fix a few inconsistencies and be more useful/correct downstream
2013-11-04 15:34:51 -08:00
Victor Vieux
747967b4a4
rebase and add some filters
2013-10-31 19:25:55 -07:00
Brandon Philips
393562340c
fix(systemd): provide a better description
...
Fix-up the docker service file description to declare what the service is not what it does.
When a systemd machine starts up the Description of each unit scrolls by instead of the service's filename. Because the current description doesn't say what it is it isn't very friendly:
```
Oct 31 20:40:49 localhost systemd[1]: Started Update Engine.
Oct 31 20:40:49 localhost systemd[1]: Starting Multi-User System.
Oct 31 20:40:49 localhost systemd[1]: Reached target Multi-User System.
Oct 31 20:40:49 localhost systemd[1]: Starting Easily create lightweight, portable, self-sufficient containers from any application!...
Oct 31 20:40:49 localhost systemd[1]: Started Easily create lightweight, portable, self-sufficient containers from any application!.
```
2013-10-31 14:41:49 -07:00