introduce top-level Makefile to build the docker binary #161
Conversation
|
the Makefile should respect an existing |
|
@srid very good point. thank you. Let me think how to address this. |
|
@srid, will this approach work for you? |
|
+1 ... i personally have two preferences,
|
|
@srid, I changed thedir to .gopath and introduced a possibility to perform verbose operations |
|
@sa2ajj so far looks good to me, except this: i have the docker source repo cloned under $GOPATH/src/github.com/dotcloud/docker (in future, once docker goes public, i could use when |
|
@srid, you have a very particular setup that helps to find all corner cases :) I took a slightly different approach. Does it work for you? |
| @rm -rf $(dir $(DOCKER_BIN)) | ||
| ifeq ($(GOPATH), $(BUILD_DIR)) | ||
| @rm -rf $(BUILD_DIR) | ||
| else ifneq ($(DOCKER_DIR), $(realpath $(DOCKER_DIR))) |
There was a problem hiding this comment.
not sure why the clean target is not being simply written as follows.
clean:
@rm -rf $(dir $(DOCKER_BIN))
@rm -rf $(BUILD_DIR)it seems to take care of both the cases (GOPATH being already set or not).
There was a problem hiding this comment.
because it takes care of three cases:
GOPATH is notset
GOPATH is set, but docker is elsewhere
GOPATH is set and docker is within it
There was a problem hiding this comment.
If you're building with the Makefile, aren't you implicitly expecting that
GOPATH will be overridden for the duration of the build?
Eg. I don't think there's a need for injecting other GOPATH locations into
the build.
On Tue, Mar 26, 2013 at 10:49 AM, Mikhail Sobolev
[email protected]:
In Makefile:
+all: $(DOCKER_BIN)
+
+$(DOCKER_BIN): $(DOCKER_DIR)
- @mkdir -p
$(dir $ @)- @(cd
$(DOCKER_MAIN); go get $ (GO_OPTIONS); go build$(GO_OPTIONS) -o $ @)- @echo $(DOCKER_BIN_RELATIVE) is created.
+$(DOCKER_DIR):
+clean:
because it takes care of three cases:
GOPATH is notset
GOPATH is set, but docker is elsewhere
GOPATH is set and docker is within it—
Reply to this email directly or view it on GitHubhttps://github.com//pull/161/files#r3536213
.
|
I think the original concern is quite valid: you do not want to download the same deps again and again. And for some people (or situations) that might be a problem. So if GOPATH is already set, let's re-use whatever is available there (downloaded and built). |
|
So, any outstanding issues? Should I try it out and merge if it works for me? |
|
I think it's now good to go (more testing from the open source users will tell us if there's any issue:)) |
container: memory_store: fix deadlock [rhel7-1.10.3]
upstream issue: moby#30311 Cherry-pick from moby#30340 fix moby#161 Signed-off-by: Dmitry Shyshkin <[email protected]> Signed-off-by: Lei Jitang <[email protected]>
Fix docker leaks ExecIds on failed exec -i upstream issue: moby#30311 Cherry-pick from moby#30340 fix moby#161 Signed-off-by: Dmitry Shyshkin <[email protected]> Signed-off-by: Lei Jitang <[email protected]> See merge request docker/docker!275
[18.09] Backport "Disabled these tests on s390x and ppc64le:"
[master] use sha256 not sha1
No description provided.