vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Expects storage driver executables to be of the form registry-storage-name

Browse source 
Moves main packages to sub-packages of the individual storage drivers
This commit is contained in:
Brian Bland 2014-11-06 10:35:15 -08:00
parent f02cfee950
commit 150677f1f5
5 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
storagedriver/ipc/client.go
View file

@ -8,13 +8,16 @@ import (
"net"
"os"
"os/exec"
"path"
"syscall"
"github.com/docker/libchan"
"github.com/docker/libchan/spdy"
)
// StorageDriverExecutablePrefix is the prefix which the IPC storage driver loader expects driver
// executables to begin with. For example, the s3 driver should be named "registry-storage-s3".
const StorageDriverExecutablePrefix = "registry-storagedriver-"
// StorageDriverClient is a storagedriver.StorageDriver implementation using a managed child process
// communicating over IPC using libchan with a unix domain socket
type StorageDriverClient struct {
@ -38,15 +41,10 @@ func NewDriverClient(name string, parameters map[string]string) (*StorageDriverC
return nil, err
}
driverPath := os.ExpandEnv(path.Join("$GOPATH", "bin", name))
if _, err := os.Stat(driverPath); os.IsNotExist(err) {
driverPath = path.Join(path.Dir(os.Args[0]), name)
}
if _, err := os.Stat(driverPath); os.IsNotExist(err) {
driverPath, err = exec.LookPath(name)
if err != nil {
return nil, err
}
driverExecName := StorageDriverExecutablePrefix + name
driverPath, err := exec.LookPath(driverExecName)
if err != nil {
return nil, err
}
command := exec.Command(driverPath, string(paramsBytes))