beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
48120 commits 14 branches 412 tags 338 MiB
Commit graph

687 commits

Author SHA1 Message Date
Vincent Batts
d7c37b5a28 Dockerfile: buildtags for old btrfs 
Since the build uses ubuntu 14.04, which has an old btrfs, include the
buildtags needed for this old version to not break the build.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-11-13 16:44:00 -05:00
unclejack
03f67aa46a bump fpm to 1.3.2 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-05 10:12:57 +02:00
Sven Dowideit
6ed610fb80 DOCKER_VERSION and docker-version havn't been implemented. 
So far, it looks like the declarations are not used, and so its safer not to
confuse people into thinking they do something.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-10-21 16:04:11 +10:00
Michael Crosby
e0a1df8e68 Write s3cfg to $HOME 
Because of the base image change, $HOME is not always / and we need to
write to the proper $HOME within the container to complete the release
process.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-14 03:34:24 +00:00
unclejack
da34672de6 bump Go to 1.3.3 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-10-01 17:14:48 +03:00
unclejack
0f15221240 bump Go to 1.3.2 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-26 12:48:28 +03:00
unclejack
9e5592d6a1 integ-cli: fix TestImportDisplay & add FileServer 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-16 01:54:21 +03:00
Alexandr Morozov
c6595b3ee8
bump Go to 1.3.1 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-13 10:49:03 +04:00
Brian Goff
3f136dc0e0 Use pure go markdown processor to generate man files 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-08-07 07:06:39 -04:00
Tianon Gravi
fc637b5275 Standardize "apt-get install" usage across the repo 
I might have missed some, but I think this is most of the offenders.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-28 17:41:59 -06:00
Tianon Gravi
5ef1126669 Merge pull request #6943 from tiborvass/parallel_compile_test 
Parallel compile test binaries
 2014-07-28 12:32:56 -06:00
unclejack
d0a0e91f1f bump Go to 1.3 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-07-26 21:33:31 +03:00
Tibor Vass
81e78db507 remove temporary line in Dockerfile that prevented cache miss 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-07-26 11:46:52 -04:00
Victor Vieux
b3ee9ac74e update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-24 22:19:50 +00:00
Solomon Hykes
781a47e3f3 Merge pull request #6885 from tianon/standard-curl-sSL 2014-07-14 18:39:31 -07:00
Tibor Vass
457166295c Replace ADD with COPY in Dockerfile 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-07-09 17:05:51 -04:00
Tianon Gravi
9f61e233c6 Standardize "curl" arguments across the repo to be or include "-sSL" 
- https://botbot.me/freenode/docker-dev/msg/17315692/
- https://botbot.me/freenode/docker-dev/msg/17315994/

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-07 10:35:38 -06:00
Tianon Gravi
886d3c9396 Simplify "adduser" in the Dockerfile to use the more scripting-friendly "useradd" 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-23 14:32:43 -06:00
Tianon Gravi
efa79a09a9 Add specific branch of jpetazzo's busybox to clone from so we can assume nice things about it 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-23 14:32:43 -06:00
Victor Vieux
5eef0a28cb add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-21 00:10:07 +00:00
Michael Crosby
94f01184be Update lxc requirement to 1.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-20 20:45:22 +00:00
unclejack
599cb12bb8 add unprivilegeduser via the Dockerfile 
This changes the test TestBuildWithInaccessibleFilesInContext to not
add the user 'unprivilegeduser' and add it via the Dockerfile instead.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-05-19 23:55:28 +03:00
cyphar
46a47f0dcb Dockerfile: updated ubuntu release used for builds 
This patch just revs the Ubuntu release used for builds from 13.10
to 14.04.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
 2014-05-10 11:38:12 +10:00
Victor Vieux
ae686c0486 Revert "add apparmor to the Dockerfile" 
This reverts commit fa1e390cad.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-01 21:49:53 +00:00
Victor Vieux
fa1e390cad add apparmor to the Dockerfile 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-01 20:51:16 +00:00
Tianon Gravi
e55ed741c2 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)
 2014-04-21 10:42:46 -07:00
Tianon Gravi
7bb72fa080 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)
 2014-04-14 13:35:54 -06:00
Tianon Gravi
cf655ca98d Update DOCKER_CROSSPLATFORMS to be more readable 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-04-08 09:42:47 -06:00
Dan Walsh
4c43566925 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)
 2014-03-26 15:30:40 -04:00
Tianon Gravi
44fe8cbbd1 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)
 2014-03-13 11:46:02 -06:00
Guillaume J. Charmes
6ccfb7fb9a
Update bsd specs 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-03-10 15:19:08 -07:00
Tianon Gravi
0b23393ba1 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)
 2014-03-06 13:39:17 -07:00
unclejack
4a688d6864 bump go to 1.2.1 in the Dockerfile 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-03-03 15:09:54 +02:00
Tianon Gravi
f4a7c43776 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)
 2014-02-03 11:08:35 -07:00
Tianon Gravi
6922f1be08 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)
 2014-02-01 23:23:33 -07:00
Victor Vieux
523341d994 Merge pull request #3857 from creack/remove_darwin_files 
Remove all darwin specific files and use more generic _unsupported with build tags.
 2014-01-31 11:48:10 -08:00
Tianon Gravi
065dd231dd 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)
 2014-01-31 03:16:42 -07:00
Tianon Gravi
94c5f51c4a 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)
 2014-01-29 13:13:32 -07:00
Tianon Gravi
94566b748e 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)
 2014-01-27 17:18:33 -07:00
Evan Krall
c2a59dfe48 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)
 2014-01-10 11:45:00 -08:00
Tianon Gravi
7fd6dcc831 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.
 2014-01-01 22:34:22 -07:00
Tianon Gravi
484a75f354 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) 2013-12-29 23:27:01 -07:00
Tianon Gravi
c3ec696284 Merge pull request #3244 from codeaholics/remove-apt-errors-during-build 
Tidy up some of the error messages from apt during build
 2013-12-19 13:28:56 -08:00
Tianon Gravi
62a81370ff Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X) 2013-12-19 11:33:49 -07:00
Danny Yates
36e060299f Tidy up some of the error messages from apt during build 2013-12-17 13:50:37 +00:00
Tianon Gravi
a1c5e276f4 Add "-a" back to our "go build" 2013-12-16 23:50:03 -07:00
Tianon Gravi
59dc2876a7 Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts 2013-12-13 11:59:54 -07:00
Tianon Gravi
7f1a91121c Update Dockerfile with all-caps INSTRUCTIONS (as explained in docs as being "convention": http://docs.docker.io/en/latest/use/builder/#format) 2013-12-01 21:31:28 -07:00
Tianon Gravi
5c5f670901 Update to Go 1.2 officially, now that it is released 2013-12-01 15:11:10 -07:00
Danny Yates
ad23745456 Clone LVM using https: instead of git: 
The ports for the git protocol are not open in all corporate environments
 2013-11-25 17:12:18 +00:00
Michael Crosby
2382a0f920 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	server.go
 2013-11-20 11:07:42 -08:00
Michael Crosby
2cccbbdadd Pip python deps to a specific version 2013-11-19 19:25:54 -08:00
Guillaume J. Charmes
28d4cbbc59
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
 2013-11-19 14:58:12 -08:00
Tianon Gravi
9e1da3ec9c Update to go1.2rc5 2013-11-17 22:36:26 -07:00
Guillaume J. Charmes
7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin 
Conflicts:
	utils.go
	utils_test.go
 2013-11-14 14:02:44 -08:00
Tianon Gravi
8523d5518c Update to go1.2rc4 2013-11-12 21:51:12 -07:00
Solomon Hykes
165d1bdbc0 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	runtime.go
 2013-11-07 23:26:52 +00:00
Tianon Gravi
fcc0ac6109 Bump Dockerfile to go1.2rc3 2013-11-04 21:12:18 -07:00
Tianon Gravi
d11f75b505 Add libdevmapper static compilation to Dockerfile for device-mapper 2013-11-04 16:11:33 -07:00
Tianon Gravi
24dd838aee Update Dockerfile to consistently use tabs as the command argument separator 2013-11-04 15:39:16 -07:00
Jérôme Petazzoni
31638ab2ad Refactor HostConfig and escape apparmor confinement 2013-11-01 13:55:19 -07:00
Victor Vieux
6c863b49ef remove docker ls and add docker link in usage and switch to go1.2rc2 2013-10-25 15:13:25 -07:00
Michael Crosby
1cbdaebaa1 Add links for container relationships and introspection 2013-10-25 15:13:24 -07:00
Victor Vieux
ee7d9b0bde Update Dockerfile test comment 2013-10-16 00:31:34 +00:00
Flavio Castelli
ca56b35e53 Fixed broken tests 
Some tests failed because the `auplink` binary was not found inside of the
"docker" container.
 2013-10-15 11:44:56 +02:00
Tianon Gravi
ccefe47897 Add cleanup/refactor portion of #2010 for hack and Dockerfile updates 2013-09-30 13:57:30 -06:00
Solomon Hykes
e37dcd726f Hack: use vendored dependencies in-place, for less moving parts when developing 2013-09-09 15:05:25 -07:00
Wes Morgan
20d24a450c move deps installation to vendor.sh script 2013-09-07 17:35:48 -07:00
Solomon Hykes
d757bd0904 Document using the Dockerfile for interactive dev/test cycles 2013-09-06 20:16:13 -07:00
Solomon Hykes
47838051be 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. 2013-09-06 20:14:03 -07:00
Solomon Hykes
fa806f26af Add usage instructions to the Dockerfile. Build, test and release docker using docker. 2013-09-06 19:58:05 -07:00
Solomon Hykes
34eab42833 Adapt Dockerfile to run docker tests inside docker 2013-09-06 19:27:49 -07:00
Michael Crosby
ea813d8593 Update tar pkg revision number 2013-09-03 18:30:32 +00:00
unclejack
72cfa3de35 use libffi-dev, don't build it from sources 2013-08-23 19:13:30 +03:00
Kawsar Saiyeed
2191419f4c Removed duplicate mercurial install command 2013-08-22 23:12:28 +01:00
Jérôme Petazzoni
b5a48eaed3 Moved release scripts to hack/release and updated instructions. 2013-08-20 19:36:06 -07:00
Jérôme Petazzoni
9c06420b18 Implement apt-secure repository signing. 2013-08-20 19:35:31 -07:00
Jérôme Petazzoni
abfa7a204d Update to go 1.1.2. 2013-08-20 19:35:30 -07:00
Jérôme Petazzoni
9694fb85d7 Install python-magic (it helps s3cmd) and a convenience /src symlink 2013-08-20 19:35:30 -07:00
Jérôme Petazzoni
fbd5b20c38 Running the build image will now execute release.sh automatically. 2013-08-20 19:35:30 -07:00
Jérôme Petazzoni
ff30eb96b6 Protect the release.sh script against accidental use. Infer VERSION automatically. 2013-08-20 19:35:30 -07:00
Guillaume J. Charmes
bdbac9f7a1 Upgrade Dockerfile with new dependency 2013-08-20 19:35:30 -07:00
Solomon Hykes
89ee524229 Good-bye, ugly mega-Makefile. Docker can now be built with docker, with the help of a simple very simple shell script. 2013-08-20 19:34:10 -07:00
Michael Crosby
25d71fb01b Merge pull request #1509 from dotcloud/1359-tar-pkg-ref 
Add import for dotcloud/tar to replace std tar pkg
 2013-08-14 11:26:49 -07:00
Michael Crosby
ec61c46bf7 Add import for dotcloud/tar to replace std tar pkg 2013-08-12 22:42:29 +00:00
Kawsar Saiyeed
def9598ed9 Install websocket library before building docker 2013-08-12 05:22:33 +01:00
Solomon Hykes
9f1fc40a64 * Hack: standardized docker's build environment in a Dockerfile 2013-07-08 21:30:29 -07:00