ff5f13dc15
Add --dryrun to allow testing to the docs-release site, and then fix the double dollar mistake
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 4bae6235c0aec3a0e3805b046a08fc7e6aadd46b
Component: engine
2014-10-24 11:36:07 +10:00
449c9e0d74
hack: TIMEOUT (for controlling test timeout) and forwarding of
...
BUILDFLAGS to binary/dynbinary.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: aa129b356ff9f16409cba25e9f16805923970cad
Component: engine
2014-09-25 14:25:43 -07:00
6ae4c9014c
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
5fa2981ff0
avoid publishing to the root unless specified, so old version releases only goto their own dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4d109f6158c7607ee4cd9907b17ddba5f4d29d04
Component: engine
2014-07-22 19:05:18 +10:00
3c148b5823
Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set
...
If "DOCKER_HOST" is set, we can usually assume the user is connecting to a remote Docker and thus not bind mount anything by default (meaning the Makefile will more often DWIM for our users).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c2653b0a9ed4b371342fc2019c56d9433197171e
Component: engine
2014-07-07 10:54:03 -06:00
518e2ca12c
add Docker version and branch to html header
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 5f6a7253321ffafdf84f53ea0253dd703b105c6b
Component: engine
2014-06-25 16:23:33 -07:00
3bd2cdddb8
Add "cross" to the "test" Makefile target
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 8ec01f9dc1d18c532f60f1bfb6c0ab5eea378b3c
Component: engine
2014-05-15 16:21:17 -06:00
79d31745eb
Add new test-unit make rule which only runs the unit tests. Renames test
...
bundle to test-unit.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: a39f3c9200d574c12b88fb91654f1242ec07b7b5
Component: engine
2014-04-29 23:26:27 +00:00
f54d99728b
Add a TESTDIRS variable to the test bundle to allow for the running of a
...
single go directory worth of tests.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 6e05c420c9b7e4660b391643be21720d6f80e18d
Component: engine
2014-04-29 20:55:04 +00:00
9a6a4062e0
make the non-release doc warning conditional and add version info
...
use the beta-warning area to tell the user what VERSION of docker, git
branch, and links to the official release version docs are.
requires / extends PR #5272
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: dc982d3053bf46e03ad27c29d4662a9d5ba5e819
Component: engine
2014-04-23 21:07:12 +10:00
746d0d0ba1
don't try allocating a port to upload a docs release to s3
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: e0af429a2acd7681f423ca29ff88b60d9bf2450f
Component: engine
2014-04-23 11:59:16 +10:00
ea4b2c62dc
Add "validate" Makefile target
...
This was supposed to be part of my previous PR, but somehow got missed.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7de1557b2e5bc1ed86e19ffe080889ac74beea42
Component: engine
2014-04-16 18:56:02 -06:00
0bb55ea3f4
move the documentation to markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: )
Upstream-commit: 936a03bfddb24cd45f5f12c20a961bf2ae6ede93
Component: engine
2014-04-16 00:02:10 +00:00
3057a30784
cli integration: allow driver selection via vars
...
This makes it possible to choose the graphdriver and the execdriver
which is going to be used for the cli integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 62b08f557db91cc5cd12ea9ceb0a4d8cf3d6e0f1
Component: engine
2014-04-04 19:03:07 +03:00
5daacf2dcb
Update Makefile with several improvements
...
Especially but not limited to:
- make BINDDIR= ... - for when you don't want a bind mount at all
- make DOCSPORT=9000 docs - for when you want a not-8000 docs port
- when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest")
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: b51fe1783347c1bf679870925a271531a925b7e9
Component: engine
2014-04-01 22:43:38 -06:00
55841b2181
Merge pull request #4904 from creack/make_dev
...
Add "BINDDIR" variable to facilitate having a shell with the full source tree bind-mounted
Upstream-commit: 527bb5e9602fdcd78e4bad99d9a56300d830e6af
Component: engine
2014-04-01 10:19:56 -06:00
d65f1f9f12
Add $BINDIR to allow mounting the whole sources if needed (for development)
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: bd24eb07b6c3a9448d8b4a8b3ab0d9cd60995aaa
Component: engine
2014-04-01 09:01:27 -07:00
624997be0f
initial version of cli integration tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 6db32fdefdae49843ed9535b3af1099e6bd2755d
Component: engine
2014-03-29 23:09:40 +02:00
d1e812bd95
remove warnings from makefile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b9cb95c0a07e421c8cbf83fa79aaedead809c802
Component: engine
2014-03-03 23:32:25 +00:00
0eecb77d00
make docker build -rm=true default #4292
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 0b4aeb79d9e920f5a713a8ae57e3fdde011689e6
Component: engine
2014-02-26 11:04:06 -05:00
077c2ff0d6
Quote volume path to allow spaces
...
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
Upstream-commit: 5006509131986093a9529a748e80e023e19548f3
Component: engine
2014-02-17 10:24:50 -08:00
b3054dc35d
add make test-integration
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 4326e541f843e5c053221f15fef546b42ba29e25
Component: engine
2014-01-30 23:50:23 +00:00
0f4b49bea8
Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: eaa9c85511620aa82f1876e1503604f591f00d23
Component: engine
2014-01-14 19:23:30 -07:00
cec8247ebd
Update Makefile to use "docker:GIT_BRANCH" as the generated image name for increased versatility
...
... and other minor Makefile improvements :)
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: a95712899e33f267a3061fa94d05189e7c371eaa
Component: engine
2014-01-07 18:38:07 -07:00
7db2296200
Update cross and tgz to play nicely together (creating a tgz for each supported OS/ARCH), and update release.sh to upload binaries and tgz files for all the supported OS/ARCH combos
...
Upstream-commit: 4100e9b7df5cbce855b47b3625d34c9667e40dc1
Component: engine
2013-12-23 23:55:06 -07:00
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
433f293713
Merge pull request #3132 from tianon/hack-separate-integration
...
Separate Integration Tests
Upstream-commit: 23ab0af2ff3083f475b67787cc5619ead5524948
Component: engine
2013-12-13 10:55:49 -08:00
0675a87be6
make docs is more consistent
...
Upstream-commit: 27646c445951b47a728675764d7ef2b198436156
Component: engine
2013-12-11 10:14:56 +10:00
bc39a675a4
Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript)
...
Upstream-commit: f0879a1e145f31569e9e4e61f429de858bb636ab
Component: engine
2013-12-08 18:43:24 -07:00
610b53a9fe
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
...
Upstream-commit: 00030ced4bf2d0242883fae0b4ece61149f1d437
Component: engine
2013-12-04 16:56:01 -07:00
05ddc4a077
Support TESTFLAGS
...
Upstream-commit: d21563ced3a24ebfc8a9b53e5ec687543f7b2979
Component: engine
2013-12-03 14:49:10 -05:00
5d92296f82
Minor fixes based on discussions on #2693
...
* Volume exports ./bundles instead of root directory
* Documents build using docker-docs instead of docker:docs
* Bundles directory is created before running build or docs
Upstream-commit: 56ab9cb0d5169401616acc7a396e9f4af00ed670
Component: engine
2013-11-30 00:09:41 -08:00
d9f05e38d8
Removing sudo
...
Upstream-commit: 7267c4b746ad3b86d1174aeed4c06679476e8a27
Component: engine
2013-11-14 05:53:53 +00:00
04362619c5
Adding a makefile
...
Upstream-commit: 26533eb2c419155b93e3f403d081fb3c52d4dc45
Component: engine
2013-11-14 05:34:25 +00:00
4299704169
Good-bye, ugly mega-Makefile. Docker can now be built with docker, with the help of a simple very simple shell script.
...
Upstream-commit: 89ee5242291c50402973ffb73fe1dbbf5820e44c
Component: engine
2013-08-20 19:34:10 -07:00
554c357a3e
update http://get.docker.io/latest
...
Upstream-commit: e66e0289abc213164dca1e1eadfb0380b6e81904
Component: engine
2013-07-30 17:18:19 +00:00
9acb16337a
Merge pull request #1147 from dotcloud/1104-testing-static
...
testing, issue #1104 : Make the test use static flags
Upstream-commit: c21c5afe0077cc7a0ac52fb2e77a1c4aacc927ec
Component: engine
2013-07-23 17:07:36 -07:00
1aa2442604
Packaging, issue #1174 : Add pure binary to docker release
...
Upstream-commit: bf26ae03cfe38fc0fdd6f7dedd53041204df0767
Component: engine
2013-07-10 17:39:00 -07:00
dabdb2f88b
testing, issue #1104 : Make the test use static flags
...
Upstream-commit: 4388bef996063b3b69e738082b6820d3a979921e
Component: engine
2013-07-05 16:49:55 -07:00
4d3023b64d
Testing|hack, issue #1009 : Update make kack environment
...
Upstream-commit: cc63c1b584a06a41482bf967908bab10853799f6
Component: engine
2013-06-24 15:01:51 -07:00
162b88e0bd
Merge pull request #801 from dotcloud/build_docker_static
...
* Makefile: Add link flags in order to link statically and without debug symbols
Upstream-commit: 5ccde4dffc836fb0c6ea967d5d61920edfb65bd0
Component: engine
2013-06-21 02:30:57 -07:00
c95a11fa88
Makefile: added missing -a option
...
Upstream-commit: db60337598d264dc02d67e0dde93b300bf971903
Component: engine
2013-06-20 10:39:09 -07:00
85aee63ed2
Add link flags in order to link statically and without debug symbols
...
Upstream-commit: c5be64fec478f5081a06480951811d30753fc46a
Component: engine
2013-06-20 10:33:54 -07:00
df7ed98feb
add testall rule
...
Upstream-commit: 2d6a49215c15e7649f8b041e5a04e75b4d360c94
Component: engine
2013-06-19 18:21:53 +00:00
e55048dc4d
gofmt and test sub directories in makefile
...
Upstream-commit: 5dcab2d361956e75d00d5bee18371395f17a663f
Component: engine
2013-06-19 14:50:58 +00:00
3c8ee31f8a
fix docker version git output
...
Upstream-commit: b25bcf1a666ebef26e2acfa132fa2b72d47d0805
Component: engine
2013-06-17 23:32:48 +00:00
9eee7b53cc
Packaging, dockerbuilder: Automate pushing docker binary packages
...
Upstream-commit: 3384943cd3bc5bb9fd79ccbda9d32a582ada69b3
Component: engine
2013-06-13 22:14:43 -07:00
0b78bccf28
Swap "go get" for "go get -d", especially to compile on go1.1rc; fixes #561
...
Upstream-commit: c4ad6b077d87bb501ed651bfc87c3e332c7d38d7
Component: engine
2013-05-08 14:51:50 -06:00
0d8c032587
Fix a bug in the Makefile which caused dependency download to fail
...
Upstream-commit: a7c0e9a355216048063894a3d47aac2d81c42c3f
Component: engine
2013-05-03 12:58:44 -07:00
e7e7fbada8
Add s3 upload to 'make release'
...
Upstream-commit: b6a5e604ab2205a547ac5b4f743cf3c4b93ffccf
Component: engine
2013-05-02 11:32:55 -07:00
