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

64 Commits

Author SHA1 Message Date
Victor Vieux
c63bf0bec6 Revert "add apparmor to the Dockerfile" 
This reverts commit fa1e390cad4fd36683e9667795967c711a4867e3.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: ae686c0486cf6e2c0c394c5eb7a26e7d59cf1472
Component: engine
 2014-05-01 21:49:53 +00:00
Victor Vieux
a24ce5fa27 add apparmor to the Dockerfile 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: fa1e390cad4fd36683e9667795967c711a4867e3
Component: engine
 2014-05-01 20:51:16 +00:00
Tianon Gravi
221acbe18c Update hack/make/ubuntu to use the new markdown-based manpages 
This also removes all the old man pages, .gitignores their directory, and updates the md2man-all.sh script to be easier to read and more friendly to being called within hack/make/ubuntu.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e55ed741c24fe9e974d08f4893c79752fb279dc4
Component: engine
 2014-04-21 10:42:46 -07:00
Tianon Gravi
abb1fb2274 Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7bb72fa080d13c3b90d624cb77530632c7705c56
Component: engine
 2014-04-14 13:35:54 -06:00
Tianon Gravi
792e71d487 Update DOCKER_CROSSPLATFORMS to be more readable 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: cf655ca98d9c230d02454a39e815fc6b11ac5aed
Component: engine
 2014-04-08 09:42:47 -06:00
Dan Walsh
f757666ccd This patch adds SELinux labeling support. 
docker will run the process(es) within the container with an SELinux label and will label
all of  the content within the container with mount label.  Any temporary file systems
created within the container need to be mounted with the same mount label.

The user can override the process label by specifying

-Z With a string of space separated options.

-Z "user=unconfined_u role=unconfined_r type=unconfined_t level=s0"

Would cause the process label to run with unconfined_u:unconfined_r:unconfined_t:s0"

By default the processes will run execute within the container as svirt_lxc_net_t.
All of the content in the container as svirt_sandbox_file_t.

The process mcs level is based of the PID of the docker process that is creating the container.

If you run the container in --priv mode, the labeling will be disabled.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4c4356692580afb3971094e322aea64abe0e2500
Component: engine
 2014-03-26 15:30:40 -04: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
Guillaume J. Charmes
519289ece2 Update bsd specs 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 6ccfb7fb9af207a9999c60e57d1c9486ca949a5e
Component: engine
 2014-03-10 15:19:08 -07:00
Tianon Gravi
24c5efffe2 Update build tags such that we can properly compile on all platforms (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0b23393ba1901df3d08916fa977707db58699eca
Component: engine
 2014-03-06 13:39:17 -07:00
unclejack
536d686ec4 bump go to 1.2.1 in the Dockerfile 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4a688d6864e0a42b5300754a077f7c0fd45a0929
Component: engine
 2014-03-03 15:09:54 +02:00
Tianon Gravi
4621ae86b1 Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable 
Everyone probably wants to run `docker pull ubuntu` before building with this change.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f4a7c437769b5cf25d852d1aee6a6c50ee42fc85
Component: engine
 2014-02-03 11:08:35 -07:00
Tianon Gravi
6732035ba0 Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs) 
This fixes compilation issues when btrfs.h isn't available (because we just need the relevant structs, which for userspace programs are supposed to come from btrfs-progs instead of the kernel headers).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 6922f1be08111d889b0585b763b08f92d7a55e05
Component: engine
 2014-02-01 23:23:33 -07:00
Victor Vieux
df82456ed9 Merge pull request #3857 from creack/remove_darwin_files 
Remove all darwin specific files and use more generic _unsupported with build tags.
Upstream-commit: 523341d994265b9f72e4869f0fd094fd15f1b480
Component: engine
 2014-01-31 11:48:10 -08:00
Tianon Gravi
e8f6d5eb59 Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 065dd231dd7d7858df982a8decfade9df936cf63
Component: engine
 2014-01-31 03:16:42 -07:00
Tianon Gravi
3aa25b2dbe Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 94c5f51c4a38422489f0f629d43958b282600111
Component: engine
 2014-01-29 13:13:32 -07:00
Tianon Gravi
f6f766084e Update Dockerfile to be based on 13.10 instead of 12.04 so that we can remove our s3cmd backports need, and so we can have the new linux-libc-dev dependency we need for compiling the btrfs driver without nasty APT hackery 
In addition, we've now hard-coded LXC version 0.8 compiled from source so that we can have the most stable dev environment possible.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 94566b748e69a57cf88ef4acbe18ecbe76bb2f54
Component: engine
 2014-01-27 17:18:33 -07:00
Evan Krall
17e2946fdd Use gzip compression in Ubuntu packages to make it at least possible to install on Lucid. 
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com> (github: EvanKrall)
Upstream-commit: c2a59dfe48e55bc93e3bed5ecde021f372151b09
Component: engine
 2014-01-10 11:45:00 -08:00
Tianon Gravi
92d3a8ac6c Add stubbed and commented "/etc/default/docker" to our deb package 
This is to especially fix FPM 1.0+ complaining that we told it we have an /etc/default/docker "config file", but didn't actually include one.
Upstream-commit: 7fd6dcc831d28cc1ca1a5d56c9043354228f087d
Component: engine
 2014-01-01 22:34:22 -07:00
Tianon Gravi
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
Tianon Gravi
c6dd97f16f Merge pull request #3244 from codeaholics/remove-apt-errors-during-build 
Tidy up some of the error messages from apt during build
Upstream-commit: c3ec6962847222ea66b90d4517c6339992399ac8
Component: engine
 2013-12-19 13:28:56 -08:00
Tianon Gravi
a7fc58e1eb Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X) 
Upstream-commit: 62a81370fffb3cfdb15ef19702f0ea07ab2f4c36
Component: engine
 2013-12-19 11:33:49 -07:00
Danny Yates
daea5c989f Tidy up some of the error messages from apt during build 
Upstream-commit: 36e060299f2c3d73b26f556f73ba58a9738fd23e
Component: engine
 2013-12-17 13:50:37 +00:00
Tianon Gravi
2433f050d8 Add "-a" back to our "go build" 
Upstream-commit: a1c5e276f4cfe4ab498b6e013e61bfc957ce6852
Component: engine
 2013-12-16 23:50:03 -07:00
Tianon Gravi
6a19f653da Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts 
Upstream-commit: 59dc2876a7d2ac0e231d7d97511e572a1d739136
Component: engine
 2013-12-13 11:59:54 -07:00
Tianon Gravi
c7e970855b Update Dockerfile with all-caps INSTRUCTIONS (as explained in docs as being "convention": http://docs.docker.io/en/latest/use/builder/#format) 
Upstream-commit: 7f1a91121c3f77ca833f43693018f6cce32b96bf
Component: engine
 2013-12-01 21:31:28 -07:00
Tianon Gravi
44554632a3 Update to Go 1.2 officially, now that it is released 
Upstream-commit: 5c5f6709017575b0b090cb5f76b75e7e733ffa2b
Component: engine
 2013-12-01 15:11:10 -07:00
Danny Yates
3705ed705e Clone LVM using https: instead of git: 
The ports for the git protocol are not open in all corporate environments
Upstream-commit: ad23745456f9bb9c1c3da3796a2ab769f192bf36
Component: engine
 2013-11-25 17:12:18 +00:00
Michael Crosby
cdb93a78ac Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	server.go
Upstream-commit: 2382a0f920f7473b2b2762d886470a417a5dbac7
Component: engine
 2013-11-20 11:07:42 -08:00
Michael Crosby
56750f8076 Pip python deps to a specific version 
Upstream-commit: 2cccbbdadd8ee7e28824c244e48acebfca96d78a
Component: engine
 2013-11-19 19:25:54 -08:00
Guillaume J. Charmes
b6950e3878 Merge branch 'master' into creack-merge-master 
Conflicts:
	api_params.go
	graph.go
	graph_test.go
	image.go
	integration/api_test.go
	integration/container_test.go
	integration/runtime_test.go
	runtime.go
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine
 2013-11-19 14:58:12 -08:00
Tianon Gravi
6f7d08bf45 Update to go1.2rc5 
Upstream-commit: 9e1da3ec9ce8e608c17d999446882ae096b8394f
Component: engine
 2013-11-17 22:36:26 -07:00
Guillaume J. Charmes
7686e1f389 Merge branch 'master' into shykes-0.6.5-dm-plugin 
Conflicts:
	utils.go
	utils_test.go
Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385
Component: engine
 2013-11-14 14:02:44 -08:00
Tianon Gravi
c52a89950a Update to go1.2rc4 
Upstream-commit: 8523d5518c500903c19a53f73c653318e4db38f9
Component: engine
 2013-11-12 21:51:12 -07:00
Solomon Hykes
c471d2b756 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine
 2013-11-07 23:26:52 +00:00
Tianon Gravi
8d563825a1 Bump Dockerfile to go1.2rc3 
Upstream-commit: fcc0ac61093d0cd0b49b11bb5f7f7501e070bd63
Component: engine
 2013-11-04 21:12:18 -07:00
Tianon Gravi
2e3d85e90f Add libdevmapper static compilation to Dockerfile for device-mapper 
Upstream-commit: d11f75b5050944e373125008be1c9683797c72a9
Component: engine
 2013-11-04 16:11:33 -07:00
Tianon Gravi
57c35f0f44 Update Dockerfile to consistently use tabs as the command argument separator 
Upstream-commit: 24dd838aeefcf4ea1f5a950a9fe0af075f00e2bf
Component: engine
 2013-11-04 15:39:16 -07:00
Jérôme Petazzoni
5e4f415366 Refactor HostConfig and escape apparmor confinement 
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
 2013-11-01 13:55:19 -07:00
Victor Vieux
5b0bbe7633 remove docker ls and add docker link in usage and switch to go1.2rc2 
Upstream-commit: 6c863b49ef9de8f203c84f7e2e55f33deeb10bdb
Component: engine
 2013-10-25 15:13:25 -07:00
Michael Crosby
952ac8a789 Add links for container relationships and introspection 
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
 2013-10-25 15:13:24 -07:00
Victor Vieux
8846d6c443 Update Dockerfile test comment 
Upstream-commit: ee7d9b0bdec40d02ba5ef25f557cca9444a19669
Component: engine
 2013-10-16 00:31:34 +00:00
Flavio Castelli
67ef149cd9 Fixed broken tests 
Some tests failed because the `auplink` binary was not found inside of the
"docker" container.
Upstream-commit: ca56b35e5334d9f6a6741830951eb1535ca6f9b2
Component: engine
 2013-10-15 11:44:56 +02:00
Tianon Gravi
33aa0c2b85 Add cleanup/refactor portion of #2010 for hack and Dockerfile updates 
Upstream-commit: ccefe47897bdcef8b56bf54d4bd324989855f3b5
Component: engine
 2013-09-30 13:57:30 -06:00
Solomon Hykes
b6370d00a5 Hack: use vendored dependencies in-place, for less moving parts when developing 
Upstream-commit: e37dcd726fe415193eaed18729251d293a018909
Component: engine
 2013-09-09 15:05:25 -07:00
Wes Morgan
9327ca0955 move deps installation to vendor.sh script 
Upstream-commit: 20d24a450cbf22b6d5268bc1fe76022fa554d6be
Component: engine
 2013-09-07 17:35:48 -07:00
Solomon Hykes
970480b8f8 Document using the Dockerfile for interactive dev/test cycles 
Upstream-commit: d757bd0904b71346b6c83622ae5685bc0c0d4349
Component: engine
 2013-09-06 20:16:13 -07:00
Solomon Hykes
742fb66041 Hack: improve the Dockerfile for an easier development workflow. Build dev container once, run a shell with source mount-binded, run tests as you edit. LIKE A BOSS. 
Upstream-commit: 47838051be695a4e74c80690ceef811dcd3ef62c
Component: engine
 2013-09-06 20:14:03 -07:00
Solomon Hykes
4d40f8afe3 Add usage instructions to the Dockerfile. Build, test and release docker using docker. 
Upstream-commit: fa806f26aff927eb0d98b41e79786ae98987da5b
Component: engine
 2013-09-06 19:58:05 -07:00
Solomon Hykes
c090718b10 Adapt Dockerfile to run docker tests inside docker 
Upstream-commit: 34eab428330ce4a56c22b03f3067dd8eeee7ed41
Component: engine
 2013-09-06 19:27:49 -07:00
Michael Crosby
0a02121daf Update tar pkg revision number 
Upstream-commit: ea813d8593d30e430ce05597becb1e394cb72a25
Component: engine
 2013-09-03 18:30:32 +00:00