diff --git a/cmd/systemdocker/system-docker.go b/cmd/systemdocker/system-docker.go deleted file mode 100644 index 5ef6a6e8..00000000 --- a/cmd/systemdocker/system-docker.go +++ /dev/null @@ -1,23 +0,0 @@ -package systemdocker - -import ( - "os" - - "github.com/docker/docker/docker" - "github.com/rancher/os/config" - "github.com/rancher/os/log" -) - -func Main() { - log.SetLevel(log.DebugLevel) - - if os.Geteuid() != 0 { - log.Fatalf("%s: Need to be root", os.Args[0]) - } - - if os.Getenv("DOCKER_HOST") == "" { - os.Setenv("DOCKER_HOST", config.SystemDockerHost) - } - - docker.RancherOSMain() -} diff --git a/scripts/build-target b/scripts/build-target index d6376996..02bed689 100755 --- a/scripts/build-target +++ b/scripts/build-target @@ -16,5 +16,5 @@ OUTPUT=${OUTPUT:-bin/ros} echo Building $OUTPUT BUILDDATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -CONST="-X github.com/docker/docker/dockerversion.GitCommit=${COMMIT} -X github.com/docker/docker/dockerversion.Version=${DOCKER_PATCH_VERSION} -X github.com/docker/docker/dockerversion.BuildTime='${BUILDDATE}' -X github.com/docker/docker/dockerversion.IAmStatic=true -X github.com/rancher/os/config.Version=${VERSION} -X github.com/rancher/os/config.OsRepo=${OS_REPO} -X github.com/rancher/os/config.BuildDate='${BUILDDATE}'" +CONST="-X github.com/rancher/os/config.Version=${VERSION} -X github.com/rancher/os/config.OsRepo=${OS_REPO} -X github.com/rancher/os/config.BuildDate='${BUILDDATE}'" go build -tags "selinux cgo daemon netgo" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static -s -w" -o ${OUTPUT}