toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "dockerversion placeholder for library-import"

Browse Source 
This reverts commit d5cd032a86617249eadd7142227c5355ba9164b4.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b78ca243d9fc25d81c1b50008ee69f3e71e940f6
Component: engine
This commit is contained in:
Brian Goff
2015-10-27 21:19:14 -04:00
parent 3babd01129
commit cc55863497
21 changed files with 51 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/utils/utils.go
View File

@ -14,10 +14,10 @@ import (
"strings"
"github.com/docker/distribution/registry/api/errcode"
"github.com/docker/docker/autogen/dockerversion"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/fileutils"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/version"
)
// SelfPath figures out the absolute path of our own binary (if it's still around).
@ -60,7 +60,7 @@ func isValidDockerInitPath(target string, selfPath string) bool { // target and
if target == "" {
return false
}
if version.IAMSTATIC == "true" {
if dockerversion.IAMSTATIC == "true" {
if selfPath == "" {
return false
}
@ -77,7 +77,7 @@ func isValidDockerInitPath(target string, selfPath string) bool { // target and
}
return os.SameFile(targetFileInfo, selfPathFileInfo)
}
return version.INITSHA1 != "" && dockerInitSha1(target) == version.INITSHA1
return dockerversion.INITSHA1 != "" && dockerInitSha1(target) == dockerversion.INITSHA1
}
// DockerInitPath figures out the path of our dockerinit (which may be SelfPath())
@ -89,7 +89,7 @@ func DockerInitPath(localCopy string) string {
}
var possibleInits = []string{
localCopy,
version.INITPATH,
dockerversion.INITPATH,
filepath.Join(filepath.Dir(selfPath), "dockerinit"),
// FHS 3.0 Draft: "/usr/libexec includes internal binaries that are not intended to be executed directly by users or shell scripts. Applications may use a single subdirectory under /usr/libexec."