Commit Graph

67 Commits

Author SHA1 Message Date
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
30a5373134 + Hack: 'make s3release' uploads a clean build to s3
Upstream-commit: 6e486b638b6674694fe02d2661bd93f0ee08d425
Component: engine
2013-05-02 11:25:49 -07:00
44a61f93b3 development; issue #374: Refactor 'make hack' making Vagrantfile and VM more useful
Upstream-commit: bb61678b570fabeb5d21c86fa3f7b5456111f7a2
Component: engine
2013-05-01 15:26:27 -07:00
f829dbfdd6 Makefile improvements
+ Convenience rules: srcrelease, deps
	- Separate dependency vendoring from building the binary
	  (re-download dependencies with 'make deps')
Upstream-commit: b3ab0b561ed6dd06a569fa800109d18070886149
Component: engine
2013-04-23 19:41:38 -07:00
0fbc38af42 Fix 'make release RELEASE_VERSION=master'
Upstream-commit: 8b8c8bf7cb0ed782d727440a0f2c59d464971353
Component: engine
2013-04-23 18:50:53 -07:00
8d65f94e38 make release: build a binary release of the most recent version tag
Upstream-commit: a8651a23b2cca4c9a9dcc3a6829e9496d68ddef5
Component: engine
2013-04-23 18:32:59 -07:00
dad1da85a7 Merge remote-tracking branch 'origin/check_kernel_capabilities'
Upstream-commit: 76b40ad6c994d8eb4c969802a172d8a808b1ac35
Component: engine
2013-04-20 17:40:25 -07:00
f7536bf802 Fixed 'hack' rule in Makefile
Upstream-commit: e81ddb2dc76ab2e502ad35363a436dd823289598
Component: engine
2013-04-19 12:55:17 -07:00
aa4998ba2b Merge remote-tracking branch 'origin/buildbot'
Upstream-commit: 4d728821e37a54629f47d7379a50ad27d5055af6
Component: engine
2013-04-19 12:47:22 -07:00
630116b2c0 Remove the NO_MEMORY_LIMIT constant
Upstream-commit: f68d107a1368b3d4f3342456a2b0675659688354
Component: engine
2013-04-18 21:08:20 -07:00
3fcc60d0f7 Allow to disable memory limit at compilation time
Upstream-commit: 1967c8342aef1a81eb33a41d673bb8e702daa5df
Component: engine
2013-04-12 10:48:20 -07:00
05a22d6527 Fix the Makefile, rule=hack to make it work on Windows
Upstream-commit: b7cda3288ed857e4e2155846090b17a2d8fccdbf
Component: engine
2013-04-09 19:07:50 -07:00
263f9f8591 testing: Add buildbot VM
Upstream-commit: bbaa975ec8ea44f7df4f96a910360abc43b4d5f7
Component: engine
2013-04-09 14:37:37 -07:00
ca62613e60 Merged shawnsi/git-version
Upstream-commit: 35c68944c7a5c7b7778c6cdb54b149e22c4c0c64
Component: engine
2013-04-02 20:26:22 -07:00
693692b24b Implementing dirty git checkout indicator
Upstream-commit: 5471f5b2ee4bd637147a1ea1dce716670b50796d
Component: engine
2013-04-02 09:58:19 -05:00
4c1daebf6d makefile: simplify "fmt" target, and include -s flag
Upstream-commit: 650dff73bdd48058ec0186cbda90683ff2287df0
Component: engine
2013-04-01 18:50:25 -03:00
a9b7db02e4 Shortening the git commit used in the version command
Upstream-commit: e566b89a5f13f36fad2e2bb37faf9079e06e051e
Component: engine
2013-04-01 16:31:33 -05:00
741a443d40 Add a 'fmt' target to the Makefile.
A convenience for gofmting all the code, including subpackages.
Upstream-commit: 9b13d21fc980b5ac12e035d9c8cbe3ef2c36a079
Component: engine
2013-04-01 13:05:00 -07:00
5f6e565b52 Adding git commit to the version output
The Makefile must be used in order to inject the git commit
via -ldflags.
Upstream-commit: 37a78902db9e968d307d0c0325612e8bef20bc69
Component: engine
2013-04-01 13:52:45 -05:00