2281d6c266
Merge pull request #12917 from jfrazelle/add-rpm
...
Add RPM for centos-7, fedora-20, fedora-21
2015-05-05 17:31:21 -07:00
b5d68944f4
Merge pull request #13004 from duglin/FixBuilderStepMsg
...
Fix issue where build steps are duplicated in the output
2015-05-05 16:06:50 -07:00
18beb55611
Add rpm for centos-6, centos-7, fedora-20, fedora-21
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-05 16:05:30 -07:00
08b7f30fcd
Fix issue where build steps are duplicated in the output
...
This fixes an issue where the build output for the "Steps" would look like:
```
Step 1: RUN echo hi echo hi
```
instead of
```
Step 1: RUN echo hi
```
Also, I noticed that there were no checks to make sure invalid Dockerfile
cmd flags were caught on cmds that didn't use cmd flags at all. They would
have been caught on the cmds that had flags, but cmds that didn't bother
to add a new code for flags would have just ignored them. So, I added
checks to each cmd to flag it.
Added testcases for issues.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-05 15:28:42 -07:00
78c70cc364
Merge pull request #13003 from moxiegirl/machine-branch-change
...
Updating branch for machine docs
2015-05-05 14:49:44 -07:00
e960e4bb12
Merge pull request #11844 from jbarbier/cgroup-parent-42
...
Adding cgroup-parent option for docker build
2015-05-05 14:46:47 -07:00
8c9d67921a
Updating branch for machine docs
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-05 14:33:31 -07:00
f0a8dfd29e
Merge pull request #12993 from psftw/support-tweak
...
Remove blanket "supported" language.
2015-05-05 16:03:02 -04:00
6bb596219f
Merge pull request #12996 from tianon/abri-à-vélo
...
Replace "docker-core" with "docker-engine" in "build-deb"
2015-05-05 10:43:15 -07:00
878dcb89f3
Make a docker-in-docker dynamic binary and add RPM target
...
This change adds a new docker-in-docker dynamic binary make target which
builds a centos container for creating the dynamically linked binary.
To use it, you first must create the static binary and then call the
dind-dynbinary target. You can call it like:
$ hack/make.sh binary dind-dynbinary rpm
This would then package the dynamic binary into the rpm after having
created it in the centos build container. Unfortunately with this approach
you can't create the rpms and the debs with the same command. They have to
be created separately otherwise the wrong version (static vs. dynamic) gets
packaged.
Various RPM fixes including:
- Adding missing RPM dependencies.
- Add sysconfig configuration files to the RPM.
- Add an epoch to silence the fpm warning.
- Remove unnecessary empty package.
Signed-off-by: Patrick Devine <patrick.devine@docker.com>
Signed-off-by: Chad Metcalf <chad@docker.com>
2015-05-05 10:01:39 -07:00
77266a67e0
Merge pull request #12947 from runcom/11577-readonly-special-file-if-readonlyfs
...
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only enabled
2015-05-05 09:45:24 -07:00
e894a901db
Merge pull request #12679 from adcaes/12607-remove-error-check
...
Add intValue and use it to get timeout form param in postContainersRestart
2015-05-05 09:38:45 -07:00
5e563d1708
Replace "docker-core" with "docker-engine" in "build-deb"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-05 10:11:59 -06:00
3efc083d4a
Remove blanket "supported" language.
...
Signed-off-by: Peter Salvatore <peter@psftw.com>
2015-05-05 11:03:53 -04:00
a2c76912e0
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
2015-05-05 08:54:28 +02:00
91fb4d672a
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
2015-05-04 22:28:01 -07:00
f838d44283
Merge pull request #12979 from Microsoft/10662-filepathgraphpush
...
Windows: Fix filepath vs path in push.go
2015-05-04 22:25:13 -07:00
677b962642
Merge pull request #12981 from SvenDowideit/marc-merlin-spelling-fix
...
spelling fix from Marc MERLIN
2015-05-04 17:53:37 -07:00
bba5fd8caa
spelling fix from Marc MERLIN
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-05-05 00:38:41 +00:00
77183ed760
Merge pull request #12890 from SvenDowideit/update-docker-hub-accounts-documentation
...
Update the Docker Hub account, org and group documentation and images
2015-05-04 16:23:08 -07:00
3b2c8f69fd
Windows: Fix filepath vs path in push.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-04 16:18:23 -07:00
56c9917815
Merge pull request #12190 from rhvgoyal/deferred-removal
...
Devicemapper: Provide deferred device removal capability
2015-05-04 14:22:52 -07:00
980c0e8c3b
Merge pull request #12948 from runcom/api-tests-container-delete
...
Add tests for API container delete
2015-05-04 17:08:52 -04:00
8771cafab6
Add tests for API container delete
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-04 22:41:57 +02:00
3fcf387d52
Merge pull request #12718 from Microsoft/10662-mkdirall
...
Windows: Volume path aware mkdirall
2015-05-04 15:51:56 -04:00
0a2ccb1cb5
Merge pull request #12769 from calavera/git_build_fragment
...
Use git url fragment to specify build reference and dir context.
2015-05-04 12:48:24 -07:00
7d371c0b47
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only is enable
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-04 21:30:52 +02:00
f93cbd2448
Merge pull request #12967 from runcom/add-self-to-maintainers
...
Add runcom to maintainers.people
2015-05-04 12:00:42 -07:00
87a0ca5283
Merge pull request #12954 from vdemeester/11595-pkg-ioutils-coverage
...
More test on pkg/ioutils (coverage)
2015-05-04 14:57:58 -04:00
9c32cd1cef
Merge pull request #10775 from duglin/BuilderFlags
...
Add support for Dockerfile CMD options
2015-05-04 11:39:09 -07:00
ea6649e701
Add runcom to maintainers.people
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-04 20:26:11 +02:00
815b472a02
Add more ioutils tests.
...
Closes #11595
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-05-04 19:56:10 +02:00
0c1c272687
Merge pull request #12865 from larsks/bug/12864
...
journald log driver: use CONTAINER_ID field for container id
2015-05-04 10:53:58 -07:00
4895a887e2
Merge pull request #12937 from runcom/daemon-as-a-service
...
Refactor server to use daemon as the service layer in controllers
2015-05-04 13:03:28 -04:00
24bd3db0b5
Merge pull request #12939 from draghuram/history_test
...
Adding test for "GET /images/(name)/history" API.
2015-05-04 12:58:43 -04:00
8ac8c2af60
Merge pull request #12936 from tianon/docker-dev
...
Rename development builds to be in the "docker-dev" repo instead of "docker"
2015-05-04 12:55:46 -04:00
4f5272320c
Merge pull request #12958 from Mashimiao/cleanup-container-functions
...
Cleanup: move container's functions to its own file
2015-05-04 09:36:55 -07:00
49fd83a25e
Use git url fragment to specify reference and dir context.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-04 09:28:06 -07:00
ac324e5e52
Merge pull request #11034 from HuKeping/oom_kill_disable
...
enable cgroups memory.oom_control
2015-05-04 11:53:05 -04:00
2e49281bd0
Merge pull request #12903 from rhvgoyal/disable-discards
...
devmapper: Disable mount option "discard" by default
2015-05-04 18:35:25 +03:00
a8d73339f2
Merge pull request #12953 from sunyuan3/404
...
Verifiy status Codes 404 when no such image.
2015-05-04 11:10:07 -04:00
f3023a93d1
Allow pulling stats once and disconnecting.
...
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.
Also adds a `--no-stream` flag to `docker stats` which does the same
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-04 10:49:13 -04:00
56f7da34fc
Merge pull request #12944 from tianon/fsnotify-1.2.0
...
Update fsnotify to 1.2.0
2015-05-04 16:57:45 +03:00
1be7a10b89
cleanup: move container's functions to its file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-04 21:37:44 +08:00
175339ffb6
Merge pull request #12943 from tianon/go-patricia-v2
...
Update go-patricia to 2.1.0
2015-05-04 16:28:03 +03:00
a4a924e1b6
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-04 21:11:29 +08:00
9eefd2c17d
Verifiy status Codes 404 when no such image
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-05-04 15:39:40 +08:00
5cec69a7b3
Update the Docker Hub account, org and group documentation and images
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-05-04 00:37:54 +00:00
fe221852b7
Merge pull request #12950 from thieman/tnt-riak-ssh-reference
...
Remove stale reference to previous SSH instructions
2015-05-03 15:42:38 -04:00
b40a5eeec8
Remove stale reference to previous SSH instructions
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
2015-05-03 14:15:17 -04:00
Vincent Batts
Jessie Frazelle
Jessica Frazelle
Doug Davis
moxiegirl
Arnaud Porterie
Sebastiaan van Stijn
David Calavera
Patrick Devine
Alexander Morozov
Tianon Gravi
Peter Salvatore
Adria Casas
Tibor Vass
Fred Lifton
Sven Dowideit
John Howard
Phil Estes
Antonio Murdaca
mauriyouth
Michael Crosby
Vincent Demeester
unclejack
Brian Goff
Ma Shimiao
HuKeping
Yuan Sun
James Turnbull
Travis Thieman