rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-28 15:56:58 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1056 from joshwget/respect-customization

Browse Source 
Fix two instances where customization isn't respected
This commit is contained in:
Darren Shepherd 2016-06-28 15:44:08 -07:00 committed by GitHub
commit b0c6ad709c
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/control/console.go
View File

@ -76,7 +76,7 @@ func consoleSwitch(c *cli.Context) error {
Privileged: true, Privileged: true,
Net: "host", Net: "host",
Pid: "host", Pid: "host",
Image: fmt.Sprintf("rancher/os-base:%s", config.VERSION), Image: config.OS_BASE,
Labels: map[string]string{ Labels: map[string]string{
config.SCOPE: config.SYSTEM, config.SCOPE: config.SYSTEM,
}, },

2
cmd/control/selinux.go
View File

@ -50,7 +50,7 @@ func selinuxCommand() cli.Command {
"-v", "/etc/selinux:/etc/selinux", "-v", "/etc/selinux:/etc/selinux",
"-v", "/var/lib/selinux:/var/lib/selinux", "-v", "/var/lib/selinux:/var/lib/selinux",
"-v", "/usr/share/selinux:/usr/share/selinux", "-v", "/usr/share/selinux:/usr/share/selinux",
fmt.Sprintf("rancher/os-selinuxtools:%s", config.VERSION+config.SUFFIX), "bash"} fmt.Sprintf("%s/os-selinuxtools:%s%s", config.OS_REPO, config.VERSION, config.SUFFIX), "bash"}
syscall.Exec("/bin/system-docker", argv, []string{}) syscall.Exec("/bin/system-docker", argv, []string{})
return nil return nil
} }

6
config/types.go
View File

@ -1,6 +1,7 @@
package config package config
import ( import (
"fmt"
"runtime" "runtime"
"github.com/coreos/coreos-cloudinit/config" "github.com/coreos/coreos-cloudinit/config"
@ -50,6 +51,8 @@ var (
VERSION string VERSION string
ARCH string ARCH string
SUFFIX string SUFFIX string
OS_REPO string
OS_BASE string
PrivateKeys = []string{ PrivateKeys = []string{
"rancher.ssh", "rancher.ssh",
"rancher.docker.ca_key", "rancher.docker.ca_key",
@ -69,6 +72,9 @@ func init() {
if SUFFIX == "" && ARCH != "amd64" { if SUFFIX == "" && ARCH != "amd64" {
SUFFIX = "_" + ARCH SUFFIX = "_" + ARCH
} }
if OS_BASE == "" {
OS_BASE = fmt.Sprintf("%s/os-base:%s%s", OS_REPO, VERSION, SUFFIX)
}
} }
type Repository struct { type Repository struct {

2
scripts/build-target
View File

@ -15,6 +15,6 @@ fi
OUTPUT=${OUTPUT:-bin/ros} OUTPUT=${OUTPUT:-bin/ros}
echo Building $OUTPUT echo Building $OUTPUT
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=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -X github.com/docker/docker/dockerversion.IAmStatic=true -X github.com/rancher/os/config.VERSION=${VERSION}" 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=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -X github.com/docker/docker/dockerversion.IAmStatic=true -X github.com/rancher/os/config.VERSION=${VERSION} -X github.com/rancher/os/config.OS_REPO=${OS_REPO}"
go build -tags "selinux cgo daemon netgo dnspatch" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static" -o ${OUTPUT} go build -tags "selinux cgo daemon netgo dnspatch" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static" -o ${OUTPUT}
strip --strip-all ${OUTPUT} strip --strip-all ${OUTPUT}