681f4d84ae
Update Dockerfile to use Godeps for distribution
...
Update our "registry" install to use the included Godeps libraries so that it
doesn't require anything from our current source (hence moving it up for
better caching too)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-20 19:52:08 -08:00
f46923be8e
Resolve ambiguity on registry v2 ping
...
v2 ping now checks for a Docker-Distribution-API-Version
header that identifies the endpoint as "registry/2.0"
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-01-20 19:52:08 -08:00
b2fe1b3dd9
Merge pull request #10155 from tianon/netgo-take-three
...
Let's try fixing "netgo" again
2015-01-20 09:45:42 -08:00
232d59baeb
Let's try fixing "netgo" again
...
Since "go test" doesn't seem to support "-installsuffix" as quite the same perfect solution that "go build" is happy to let it be, let's just switch those crappy old "integration/" tests to use our separate static dockerinit binary so we don't have to worry about compiling the entire test harness statically. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-19 12:48:25 -07:00
8b95ad230e
Merge pull request #9784 from dmcgowan/v2-registry
...
Client Support for Docker Registry HTTP API V2
2015-01-19 10:46:38 -08:00
933f957e77
bump go to 1.4.1
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-01-16 09:45:37 +02:00
ef96c28754
Install registry V2 in image
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-15 14:05:06 -08:00
e7cfb1c28b
Revert "Add proper "netgo" compiling, thanks to rsc ♥"
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jfrazelle@users.noreply.github.com> (github: jfrazelle)
2015-01-14 09:55:35 -08:00
b5aba426d4
Add proper "netgo" compiling, thanks to rsc ♥
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-13 21:35:21 -07:00
3c01c971cd
Switch docker-py clone to use an explicit commit for natural cache-busting
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-13 12:34:55 -07:00
3873b19c31
Bumped docker-py version to latest release
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-01-12 15:01:09 -08:00
cdc14c7cbf
Add apparmor
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-09 18:22:19 -08:00
b20363c4c0
Add "gofmt" from Go 1.3.3
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-09 09:54:58 -07:00
2677f1add4
Refactor Dockerfile version number usage
...
This refactors version number usage for several of our "download/install this exact version" bits so we have an easier time replacing the version numbers in Jenkins.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-09 09:53:39 -07:00
e3b3719f16
Install lxc from source.
...
Haters gunna hate, cache bust. But this fixes a bunch of tests.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-08 11:37:48 -08:00
179e9deb1a
Adjust Dockerfile style to be more consistent
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 00:26:19 -07:00
6ac802ecd8
Reinstall standard library with netgo
...
Fixes #9449
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2014-12-21 13:49:45 +02:00
62e8a93c34
bump Go to 1.4
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-12-21 13:49:45 +02:00
100267de81
Tweak test-docker-py feature
...
- move docker/docker-py clone to the Dockerfile
- put "integration test daemon startup" code in a separate file for both scripts to source
- add new test-docker-py Makefile target
- include "python-websocket" package in Dockerfile for running the tests
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-19 10:47:01 -07:00
5d6eca6642
Add docker-py integration tests aginst the docker daemon
...
This clones and run the integration tests for docker-py master as part
of the integration tests created on master. docker-py hits the api
directly and should be a good way to identify regressions in the api.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-17 13:48:45 -08:00
54229fad93
Add windows back.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-12 13:44:41 -08:00
750dc335a9
Windows should not be officially released.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-11-26 11:50:07 -08:00
b7703a992e
Add windows/(386,amd64) to cross platforms list
...
Edited make scripts to append .exe to windows binary
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
2014-11-14 18:20:54 -08:00
8bb6957d3b
Merge pull request #9165 from hansrodtang/master
...
Updated cover tool import path.
2014-11-14 14:10:20 -07:00
b4336803f3
Updated cover tool import path.
...
Signed-off-by: Hans Rødtang <hansrodtang@gmail.com>
2014-11-14 06:16:41 +01:00
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
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
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
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
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
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
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
c6595b3ee8
bump Go to 1.3.1
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-13 10:49:03 +04:00
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
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
5ef1126669
Merge pull request #6943 from tiborvass/parallel_compile_test
...
Parallel compile test binaries
2014-07-28 12:32:56 -06:00
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
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
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
781a47e3f3
Merge pull request #6885 from tianon/standard-curl-sSL
2014-07-14 18:39:31 -07:00
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
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
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
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
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
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
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
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
ae686c0486
Revert "add apparmor to the Dockerfile"
...
This reverts commit fa1e390cad
2014-05-01 21:49:53 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
36e060299f
Tidy up some of the error messages from apt during build
2013-12-17 13:50:37 +00:00
a1c5e276f4
Add "-a" back to our "go build"
2013-12-16 23:50:03 -07:00
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
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
5c5f670901
Update to Go 1.2 officially, now that it is released
2013-12-01 15:11:10 -07:00
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
2382a0f920
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
server.go
2013-11-20 11:07:42 -08:00
2cccbbdadd
Pip python deps to a specific version
2013-11-19 19:25:54 -08:00
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
9e1da3ec9c
Update to go1.2rc5
2013-11-17 22:36:26 -07:00
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
8523d5518c
Update to go1.2rc4
2013-11-12 21:51:12 -07:00
165d1bdbc0
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
runtime.go
2013-11-07 23:26:52 +00:00
fcc0ac6109
Bump Dockerfile to go1.2rc3
2013-11-04 21:12:18 -07:00
d11f75b505
Add libdevmapper static compilation to Dockerfile for device-mapper
2013-11-04 16:11:33 -07:00
24dd838aee
Update Dockerfile to consistently use tabs as the command argument separator
2013-11-04 15:39:16 -07:00
31638ab2ad
Refactor HostConfig and escape apparmor confinement
2013-11-01 13:55:19 -07:00
6c863b49ef
remove docker ls and add docker link in usage and switch to go1.2rc2
2013-10-25 15:13:25 -07:00
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
ee7d9b0bde
Update Dockerfile test comment
2013-10-16 00:31:34 +00:00
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
ccefe47897
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
2013-09-30 13:57:30 -06:00
e37dcd726f
Hack: use vendored dependencies in-place, for less moving parts when developing
2013-09-09 15:05:25 -07:00
20d24a450c
move deps installation to vendor.sh script
2013-09-07 17:35:48 -07:00
d757bd0904
Document using the Dockerfile for interactive dev/test cycles
2013-09-06 20:16:13 -07:00
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
fa806f26af
Add usage instructions to the Dockerfile. Build, test and release docker using docker.
2013-09-06 19:58:05 -07:00
34eab42833
Adapt Dockerfile to run docker tests inside docker
2013-09-06 19:27:49 -07:00
ea813d8593
Update tar pkg revision number
2013-09-03 18:30:32 +00:00
72cfa3de35
use libffi-dev, don't build it from sources
2013-08-23 19:13:30 +03:00
2191419f4c
Removed duplicate mercurial install command
2013-08-22 23:12:28 +01:00
b5a48eaed3
Moved release scripts to hack/release and updated instructions.
2013-08-20 19:36:06 -07:00
9c06420b18
Implement apt-secure repository signing.
2013-08-20 19:35:31 -07:00
abfa7a204d
Update to go 1.1.2.
2013-08-20 19:35:30 -07:00
9694fb85d7
Install python-magic (it helps s3cmd) and a convenience /src symlink
2013-08-20 19:35:30 -07:00
fbd5b20c38
Running the build image will now execute release.sh automatically.
2013-08-20 19:35:30 -07:00
ff30eb96b6
Protect the release.sh script against accidental use. Infer VERSION automatically.
2013-08-20 19:35:30 -07:00
bdbac9f7a1
Upgrade Dockerfile with new dependency
2013-08-20 19:35:30 -07:00
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
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
ec61c46bf7
Add import for dotcloud/tar to replace std tar pkg
2013-08-12 22:42:29 +00:00
def9598ed9
Install websocket library before building docker
2013-08-12 05:22:33 +01:00
9f1fc40a64
* Hack: standardized docker's build environment in a Dockerfile
2013-07-08 21:30:29 -07:00
Tianon Gravi
Josh Hawn
Alexander Morozov
Jessie Frazelle
unclejack
Alexander Morozov
Joffrey F
Jessica Frazelle
Michael Crosby
Ahmet Alp Balkan
Hans Rødtang
Vincent Batts
Sven Dowideit
Brian Goff
Tibor Vass
Victor Vieux
Solomon Hykes
Michael Crosby
cyphar
Dan Walsh
Guillaume J. Charmes
Victor Vieux
Evan Krall
Danny Yates
Michael Crosby
Guillaume J. Charmes
Solomon Hykes
Jérôme Petazzoni
Victor Vieux
Flavio Castelli
Wes Morgan
Kawsar Saiyeed
Jérôme Petazzoni
Guillaume J. Charmes