clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-21 21:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,332 Commits 9 Branches 112 Tags
7d38d33f018a96bde5d08ae09628d4444b0aee26
Commit Graph

15332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov 7d38d33f01 Merge pull request #12977 from Microsoft/10662-graphloadfilepath 
Windows: Filepath in graph\load.go
 2015-05-06 15:01:49 -07:00
Jessie Frazelle 54a1bb07fa Merge pull request #13018 from mbentley/nanorc-syntax 
Added nanorc for Dockerfiles
 2015-05-06 14:23:20 -07:00
Jessie Frazelle 10f4bf514d Merge pull request #12878 from cpuguy83/move_chunked_encoding_test_to_from_integration 
Move ChunkedEncoding from integration
 2015-05-06 13:59:13 -07:00
Brian Goff f9b20ad9e4 Merge pull request #12999 from duglin/BadRUNerrMsg 
Fix RUN's error msg when it fails
 2015-05-06 15:49:24 -04:00
Alexander Morozov 71c1a7ea7f Merge pull request #13017 from cpuguy83/12859_fix_lxc_wait_exitcodes 
Fix LXC stop signals
 2015-05-06 11:21:44 -07:00
Brian Goff 7c574b9e9d Move ChunkedEncoding from integration 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-06 13:00:17 -04:00
Matt Bentley 76bc44fb91 Added nanorc for Dockerfiles 
Signed-off-by: Matt Bentley <matt@docker.com>
 2015-05-06 12:41:11 -04:00
Brian Goff d2c4ee37c6 Fix LXC stop signals 
`lxc-stop` does not support sending arbitrary signals.
By default, `lxc-stop -n <id>` would send `SIGPWR`.
The lxc driver was always sending `lxc-stop -n <id> -k`, which always
sends `SIGKILL`. In this case `lxc-start` returns an exit code of `0`,
regardless of what the container actually exited with.
Because of this we must send signals directly to the process when we
can.

Also need to set quiet mode on `lxc-start` otherwise it reports an error
on `stderr` when the container exits cleanly (ie, we didn't SIGKILL it),
this error is picked up in the container logs... and isn't really an
error.

Also cleaned up some potential races for waitblocked test.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-06 11:56:48 -04:00
Brian Goff a242ceaa09 Merge pull request #12975 from Microsoft/10662-graphexportfilepath 
Windows: graph\export.go filepath fixes
 2015-05-05 21:44:57 -04:00
Vincent Batts 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
Doug Davis 54662eae10 Fix RUN's error msg when it fails 
When RUN returns with a non-zero return code it prints the command
that was executed as a Go []string:
```
INFO[0000] The command &{[/bin/sh -c noop a1 a2]} returned a non-zero code: 127
```

instead it should look like this:
```
INFO[0000] The command "/bin/sh -c noop a1 a2" returned a non-zero code: 127
```

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-05 16:08:41 -07:00
Jessie Frazelle 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
Jessica Frazelle 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
Doug Davis 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
moxiegirl 78c70cc364 Merge pull request #13003 from moxiegirl/machine-branch-change 
Updating branch for machine docs
 2015-05-05 14:49:44 -07:00
Arnaud Porterie 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
Mary Anthony 8c9d67921a Updating branch for machine docs 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-05 14:33:31 -07:00
Sebastiaan van Stijn f0a8dfd29e Merge pull request #12993 from psftw/support-tweak 
Remove blanket "supported" language.
 2015-05-05 16:03:02 -04:00
David Calavera 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
Patrick Devine 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
Alexander Morozov 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
Alexander Morozov 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
Tianon Gravi 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
Peter Salvatore 3efc083d4a Remove blanket "supported" language. 
Signed-off-by: Peter Salvatore <peter@psftw.com>
 2015-05-05 11:03:53 -04:00
Adria Casas a2c76912e0 Rename int64Value to int64ValueOrZero. 
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
 2015-05-05 08:54:28 +02:00
Tibor Vass 91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
 2015-05-04 22:28:01 -07:00
Tibor Vass 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
Fred Lifton 677b962642 Merge pull request #12981 from SvenDowideit/marc-merlin-spelling-fix 
spelling fix from Marc MERLIN
 2015-05-04 17:53:37 -07:00
Sven Dowideit bba5fd8caa spelling fix from Marc MERLIN 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-05 00:38:41 +00:00
Fred Lifton 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
John Howard 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
John Howard bb1ecde164 Windows: Filepath in graph\load.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-04 15:14:39 -07:00
John Howard 377ed712d3 Windows: graph\export.go filepath fixes 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-04 14:56:23 -07:00
Vincent Batts 56c9917815 Merge pull request #12190 from rhvgoyal/deferred-removal 
Devicemapper: Provide deferred device removal capability
 2015-05-04 14:22:52 -07:00
Phil Estes 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
Antonio Murdaca 8771cafab6 Add tests for API container delete 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-04 22:41:57 +02:00
Phil Estes 3fcf387d52 Merge pull request #12718 from Microsoft/10662-mkdirall 
Windows: Volume path aware mkdirall
 2015-05-04 15:51:56 -04:00
David Calavera 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
mauriyouth 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
Michael Crosby f93cbd2448 Merge pull request #12967 from runcom/add-self-to-maintainers 
Add runcom to maintainers.people
 2015-05-04 12:00:42 -07:00
Tibor Vass 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
Arnaud Porterie 9c32cd1cef Merge pull request #10775 from duglin/BuilderFlags 
Add support for Dockerfile CMD options
 2015-05-04 11:39:09 -07:00
Antonio Murdaca ea6649e701 Add runcom to maintainers.people 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-04 20:26:11 +02:00
Vincent Demeester 815b472a02 Add more ioutils tests. 
Closes #11595

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-05-04 19:56:10 +02:00
Jessie Frazelle 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
Phil Estes 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
Phil Estes 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
Tibor Vass 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
Alexander Morozov 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
David Calavera 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