From 9e15059789b8bb3f90a89617fb29c46fe234a95f Mon Sep 17 00:00:00 2001 From: Wang Long Date: Mon, 12 Oct 2015 19:50:17 +0800 Subject: [PATCH] Replace rancherio with rancher Signed-off-by: Wang Long --- .package | 2 +- Dockerfile.build-base | 2 +- Godeps/Godeps.json | 2 +- Makefile | 6 +++--- Makefile.docker | 2 +- cmd/cloudinit/cloudinit.go | 4 ++-- cmd/control/cli.go | 2 +- cmd/control/config.go | 2 +- cmd/control/dev.go | 2 +- cmd/control/env.go | 4 ++-- cmd/control/install.go | 6 +++--- cmd/control/os.go | 8 ++++---- cmd/control/service.go | 6 +++--- cmd/control/tlsconf.go | 2 +- cmd/network/network.go | 2 +- cmd/power/power.go | 2 +- cmd/power/shutdown.go | 2 +- cmd/sysinit/sysinit.go | 2 +- cmd/systemdocker/system-docker.go | 2 +- cmd/userdocker/main.go | 6 +++--- cmd/wait/wait.go | 4 ++-- compose/project.go | 6 +++--- config/config.go | 2 +- config/config_test.go | 2 +- config/data_funcs.go | 2 +- config/disk.go | 2 +- docker/client.go | 2 +- docker/client_factory.go | 4 ++-- docker/env.go | 2 +- docker/service.go | 2 +- docker/service_factory.go | 2 +- docker/util.go | 2 +- init/bootstrap.go | 6 +++--- init/init.go | 4 ++-- init/root.go | 2 +- init/sysinit.go | 6 +++--- main.go | 22 +++++++++++----------- os-config.yml | 2 +- scripts/docker-run.sh | 2 +- util/util_test.go | 2 +- 40 files changed, 72 insertions(+), 72 deletions(-) diff --git a/.package b/.package index f6668c73..75529c3b 100644 --- a/.package +++ b/.package @@ -1 +1 @@ -github.com/rancherio/os +github.com/rancher/os diff --git a/Dockerfile.build-base b/Dockerfile.build-base index 59659034..a0e34386 100644 --- a/Dockerfile.build-base +++ b/Dockerfile.build-base @@ -22,4 +22,4 @@ ENV PATH /go/bin:$PATH RUN go get github.com/tools/godep -WORKDIR /go/src/github.com/rancherio/os +WORKDIR /go/src/github.com/rancher/os diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 20fc0bf9..b80976ee 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "github.com/rancherio/os", + "ImportPath": "github.com/rancher/os", "GoVersion": "go1.4.1", "Packages": [ "./..." diff --git a/Makefile b/Makefile index 9d408dde..b3fba352 100644 --- a/Makefile +++ b/Makefile @@ -21,15 +21,15 @@ bin/rancheros: ros-build-image ./scripts/docker-run.sh make -f Makefile.docker $@ mkdir -p bin - docker cp ros-build:/go/src/github.com/rancherio/os/$@ $(dir $@) + docker cp ros-build:/go/src/github.com/rancher/os/$@ $(dir $@) build-all: ros-build-image ./scripts/docker-run.sh make -f Makefile.docker DEV_BUILD=$(DEV_BUILD) FORCE_PULL=$(FORCE_PULL) $@ mkdir -p bin dist - docker cp ros-build:/go/src/github.com/rancherio/os/bin/rancheros bin/ - docker cp ros-build:/go/src/github.com/rancherio/os/dist/artifacts dist/ + docker cp ros-build:/go/src/github.com/rancher/os/bin/rancheros bin/ + docker cp ros-build:/go/src/github.com/rancher/os/dist/artifacts dist/ installer: ros-build-image diff --git a/Makefile.docker b/Makefile.docker index 067aa0e3..47533682 100644 --- a/Makefile.docker +++ b/Makefile.docker @@ -6,7 +6,7 @@ GODEP := godep bin/rancheros: mkdir -p $(dir $@) - $(GODEP) go build -tags netgo -installsuffix netgo -ldflags "-X github.com/rancherio/os/config.VERSION $(VERSION) -linkmode external -extldflags -static" -o $@ + $(GODEP) go build -tags netgo -installsuffix netgo -ldflags "-X github.com/rancher/os/config.VERSION $(VERSION) -linkmode external -extldflags -static" -o $@ strip --strip-all $@ diff --git a/cmd/cloudinit/cloudinit.go b/cmd/cloudinit/cloudinit.go index 3628a534..d95ef2b7 100644 --- a/cmd/cloudinit/cloudinit.go +++ b/cmd/cloudinit/cloudinit.go @@ -38,8 +38,8 @@ import ( "github.com/coreos/coreos-cloudinit/pkg" "github.com/coreos/coreos-cloudinit/system" "github.com/rancher/netconf" - "github.com/rancherio/os/cmd/cloudinit/hostname" - rancherConfig "github.com/rancherio/os/config" + "github.com/rancher/os/cmd/cloudinit/hostname" + rancherConfig "github.com/rancher/os/config" ) const ( diff --git a/cmd/control/cli.go b/cmd/control/cli.go index 65f1d120..cad9b4e1 100644 --- a/cmd/control/cli.go +++ b/cmd/control/cli.go @@ -4,7 +4,7 @@ import ( "os" "github.com/codegangsta/cli" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" ) func Main() { diff --git a/cmd/control/config.go b/cmd/control/config.go index 5dab420a..0831248b 100644 --- a/cmd/control/config.go +++ b/cmd/control/config.go @@ -12,7 +12,7 @@ import ( "gopkg.in/yaml.v2" "github.com/codegangsta/cli" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" ) func configSubcommands() []cli.Command { diff --git a/cmd/control/dev.go b/cmd/control/dev.go index 88d36aff..bed350b0 100644 --- a/cmd/control/dev.go +++ b/cmd/control/dev.go @@ -3,7 +3,7 @@ package control import ( "fmt" "github.com/codegangsta/cli" - "github.com/rancherio/os/util" + "github.com/rancher/os/util" ) func devAction(c *cli.Context) { diff --git a/cmd/control/env.go b/cmd/control/env.go index 6b2fd266..f1bcd47b 100644 --- a/cmd/control/env.go +++ b/cmd/control/env.go @@ -7,8 +7,8 @@ import ( "syscall" "github.com/codegangsta/cli" - "github.com/rancherio/os/config" - "github.com/rancherio/os/util" + "github.com/rancher/os/config" + "github.com/rancher/os/util" ) func envAction(c *cli.Context) { diff --git a/cmd/control/install.go b/cmd/control/install.go index f2416370..775ecbef 100644 --- a/cmd/control/install.go +++ b/cmd/control/install.go @@ -9,9 +9,9 @@ import ( log "github.com/Sirupsen/logrus" "github.com/codegangsta/cli" - "github.com/rancherio/os/cmd/power" - "github.com/rancherio/os/config" - "github.com/rancherio/os/util" + "github.com/rancher/os/cmd/power" + "github.com/rancher/os/config" + "github.com/rancher/os/util" ) var installCommand = cli.Command{ diff --git a/cmd/control/os.go b/cmd/control/os.go index 81453412..84627e25 100644 --- a/cmd/control/os.go +++ b/cmd/control/os.go @@ -16,10 +16,10 @@ import ( "github.com/codegangsta/cli" "github.com/docker/libcompose/project" - "github.com/rancherio/os/cmd/power" - "github.com/rancherio/os/compose" - "github.com/rancherio/os/config" - "github.com/rancherio/os/docker" + "github.com/rancher/os/cmd/power" + "github.com/rancher/os/compose" + "github.com/rancher/os/config" + "github.com/rancher/os/docker" ) type Images struct { diff --git a/cmd/control/service.go b/cmd/control/service.go index dabf74d4..3a45ffee 100644 --- a/cmd/control/service.go +++ b/cmd/control/service.go @@ -9,9 +9,9 @@ import ( "github.com/docker/libcompose/cli/command" dockerApp "github.com/docker/libcompose/cli/docker/app" "github.com/docker/libcompose/project" - "github.com/rancherio/os/compose" - "github.com/rancherio/os/config" - "github.com/rancherio/os/util" + "github.com/rancher/os/compose" + "github.com/rancher/os/config" + "github.com/rancher/os/util" ) type projectFactory struct { diff --git a/cmd/control/tlsconf.go b/cmd/control/tlsconf.go index 9f53170a..9cbb8464 100644 --- a/cmd/control/tlsconf.go +++ b/cmd/control/tlsconf.go @@ -10,7 +10,7 @@ import ( "github.com/codegangsta/cli" machineUtil "github.com/docker/machine/utils" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" ) const ( diff --git a/cmd/network/network.go b/cmd/network/network.go index 04e9505c..b189bdb6 100644 --- a/cmd/network/network.go +++ b/cmd/network/network.go @@ -7,7 +7,7 @@ import ( log "github.com/Sirupsen/logrus" "github.com/rancher/netconf" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" ) func Main() { diff --git a/cmd/power/power.go b/cmd/power/power.go index 4c557643..4d1c550c 100644 --- a/cmd/power/power.go +++ b/cmd/power/power.go @@ -12,7 +12,7 @@ import ( log "github.com/Sirupsen/logrus" dockerClient "github.com/fsouza/go-dockerclient" - "github.com/rancherio/os/docker" + "github.com/rancher/os/docker" ) const ( diff --git a/cmd/power/shutdown.go b/cmd/power/shutdown.go index 04999664..cc131e60 100644 --- a/cmd/power/shutdown.go +++ b/cmd/power/shutdown.go @@ -4,7 +4,7 @@ import ( "os" "github.com/codegangsta/cli" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" ) func Main() { diff --git a/cmd/sysinit/sysinit.go b/cmd/sysinit/sysinit.go index f0922f9a..2e78d547 100644 --- a/cmd/sysinit/sysinit.go +++ b/cmd/sysinit/sysinit.go @@ -2,7 +2,7 @@ package sysinit import ( log "github.com/Sirupsen/logrus" - initPkg "github.com/rancherio/os/init" + initPkg "github.com/rancher/os/init" ) func Main() { diff --git a/cmd/systemdocker/system-docker.go b/cmd/systemdocker/system-docker.go index 256e2e5e..5cb99eae 100644 --- a/cmd/systemdocker/system-docker.go +++ b/cmd/systemdocker/system-docker.go @@ -6,7 +6,7 @@ import ( "syscall" log "github.com/Sirupsen/logrus" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" ) func Main() { diff --git a/cmd/userdocker/main.go b/cmd/userdocker/main.go index f9198d0a..aae982e1 100644 --- a/cmd/userdocker/main.go +++ b/cmd/userdocker/main.go @@ -14,9 +14,9 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/libcompose/docker" "github.com/docker/libcompose/project" - "github.com/rancherio/os/cmd/control" - "github.com/rancherio/os/compose" - "github.com/rancherio/os/config" + "github.com/rancher/os/cmd/control" + "github.com/rancher/os/compose" + "github.com/rancher/os/config" "github.com/opencontainers/runc/libcontainer/cgroups" _ "github.com/opencontainers/runc/libcontainer/nsenter" diff --git a/cmd/wait/wait.go b/cmd/wait/wait.go index c779c014..0fcbde76 100644 --- a/cmd/wait/wait.go +++ b/cmd/wait/wait.go @@ -4,8 +4,8 @@ import ( "os" "github.com/Sirupsen/logrus" - "github.com/rancherio/os/config" - "github.com/rancherio/os/docker" + "github.com/rancher/os/config" + "github.com/rancher/os/docker" ) func Main() { diff --git a/compose/project.go b/compose/project.go index 76bb0258..0828aa27 100644 --- a/compose/project.go +++ b/compose/project.go @@ -5,9 +5,9 @@ import ( "github.com/docker/libcompose/cli/logger" "github.com/docker/libcompose/docker" "github.com/docker/libcompose/project" - "github.com/rancherio/os/config" - rosDocker "github.com/rancherio/os/docker" - "github.com/rancherio/os/util" + "github.com/rancher/os/config" + rosDocker "github.com/rancher/os/docker" + "github.com/rancher/os/util" ) func CreateService(cfg *config.CloudConfig, name string, serviceConfig *project.ServiceConfig) (project.Service, error) { diff --git a/config/config.go b/config/config.go index 9b459c68..15d3e1ab 100644 --- a/config/config.go +++ b/config/config.go @@ -2,7 +2,7 @@ package config import ( log "github.com/Sirupsen/logrus" - "github.com/rancherio/os/util" + "github.com/rancher/os/util" "gopkg.in/yaml.v2" ) diff --git a/config/config_test.go b/config/config_test.go index d45fc3ad..4b0f94d8 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -5,7 +5,7 @@ import ( "gopkg.in/yaml.v2" "testing" - "github.com/rancherio/os/util" + "github.com/rancher/os/util" "github.com/stretchr/testify/require" "strings" ) diff --git a/config/data_funcs.go b/config/data_funcs.go index 37f4b91b..bc92ba2a 100644 --- a/config/data_funcs.go +++ b/config/data_funcs.go @@ -3,7 +3,7 @@ package config import ( log "github.com/Sirupsen/logrus" - "github.com/rancherio/os/util" + "github.com/rancher/os/util" "regexp" "strconv" "strings" diff --git a/config/disk.go b/config/disk.go index fe803574..dad890a7 100644 --- a/config/disk.go +++ b/config/disk.go @@ -10,7 +10,7 @@ import ( "github.com/coreos/coreos-cloudinit/datasource" "github.com/coreos/coreos-cloudinit/initialize" "github.com/docker/libcompose/project" - "github.com/rancherio/os/util" + "github.com/rancher/os/util" "gopkg.in/yaml.v2" ) diff --git a/docker/client.go b/docker/client.go index 0df4885b..ba379218 100644 --- a/docker/client.go +++ b/docker/client.go @@ -2,7 +2,7 @@ package docker import ( dockerClient "github.com/fsouza/go-dockerclient" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" ) const ( diff --git a/docker/client_factory.go b/docker/client_factory.go index 0c0726ea..4be5292e 100644 --- a/docker/client_factory.go +++ b/docker/client_factory.go @@ -7,8 +7,8 @@ import ( "github.com/docker/libcompose/docker" "github.com/docker/libcompose/project" "github.com/docker/machine/log" - "github.com/rancherio/os/config" - "github.com/rancherio/os/util" + "github.com/rancher/os/config" + "github.com/rancher/os/util" "github.com/samalba/dockerclient" ) diff --git a/docker/env.go b/docker/env.go index ac60546e..26ff13f3 100644 --- a/docker/env.go +++ b/docker/env.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/docker/libcompose/project" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" ) type ConfigEnvironment struct { diff --git a/docker/service.go b/docker/service.go index 0930a327..ea9351d0 100644 --- a/docker/service.go +++ b/docker/service.go @@ -6,7 +6,7 @@ import ( "github.com/docker/libcompose/docker" "github.com/docker/libcompose/project" "github.com/docker/machine/log" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" "github.com/samalba/dockerclient" ) diff --git a/docker/service_factory.go b/docker/service_factory.go index ff4b4a5d..5835929c 100644 --- a/docker/service_factory.go +++ b/docker/service_factory.go @@ -3,7 +3,7 @@ package docker import ( "github.com/docker/libcompose/docker" "github.com/docker/libcompose/project" - "github.com/rancherio/os/util" + "github.com/rancher/os/util" ) type ServiceFactory struct { diff --git a/docker/util.go b/docker/util.go index d2079c72..52ebdf3b 100644 --- a/docker/util.go +++ b/docker/util.go @@ -2,7 +2,7 @@ package docker import ( "github.com/docker/libcompose/project" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" ) func IsSystemContainer(serviceConfig *project.ServiceConfig) bool { diff --git a/init/bootstrap.go b/init/bootstrap.go index 5a6b7f03..55380176 100644 --- a/init/bootstrap.go +++ b/init/bootstrap.go @@ -10,9 +10,9 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/libcompose/project" "github.com/rancher/docker-from-scratch" - "github.com/rancherio/os/compose" - "github.com/rancherio/os/config" - "github.com/rancherio/os/util" + "github.com/rancher/os/compose" + "github.com/rancher/os/config" + "github.com/rancher/os/util" ) func autoformat(cfg *config.CloudConfig) (*config.CloudConfig, error) { diff --git a/init/init.go b/init/init.go index bb437832..9f5771f0 100644 --- a/init/init.go +++ b/init/init.go @@ -11,8 +11,8 @@ import ( log "github.com/Sirupsen/logrus" "github.com/rancher/docker-from-scratch" - "github.com/rancherio/os/config" - "github.com/rancherio/os/util" + "github.com/rancher/os/config" + "github.com/rancher/os/util" ) const ( diff --git a/init/root.go b/init/root.go index 5b9407d8..d1b52dfa 100644 --- a/init/root.go +++ b/init/root.go @@ -11,7 +11,7 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/archive" "github.com/rancher/docker-from-scratch" - "github.com/rancherio/os/config" + "github.com/rancher/os/config" ) func cleanupTarget(rootfs, targetUsr, usr, usrVer, tmpDir string) (bool, error) { diff --git a/init/sysinit.go b/init/sysinit.go index 59c7b63a..38103da6 100644 --- a/init/sysinit.go +++ b/init/sysinit.go @@ -7,9 +7,9 @@ import ( log "github.com/Sirupsen/logrus" dockerClient "github.com/fsouza/go-dockerclient" - "github.com/rancherio/os/compose" - "github.com/rancherio/os/config" - "github.com/rancherio/os/docker" + "github.com/rancher/os/compose" + "github.com/rancher/os/config" + "github.com/rancher/os/docker" ) func hasImage(name string) bool { diff --git a/main.go b/main.go index 0d1bcfd7..22dfc1de 100644 --- a/main.go +++ b/main.go @@ -7,17 +7,17 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/reexec" dockerlaunchMain "github.com/rancher/docker-from-scratch/main" - "github.com/rancherio/os/cmd/cloudinit" - "github.com/rancherio/os/cmd/control" - "github.com/rancherio/os/cmd/network" - "github.com/rancherio/os/cmd/power" - "github.com/rancherio/os/cmd/respawn" - "github.com/rancherio/os/cmd/sysinit" - "github.com/rancherio/os/cmd/systemdocker" - "github.com/rancherio/os/cmd/userdocker" - "github.com/rancherio/os/cmd/wait" - "github.com/rancherio/os/config" - osInit "github.com/rancherio/os/init" + "github.com/rancher/os/cmd/cloudinit" + "github.com/rancher/os/cmd/control" + "github.com/rancher/os/cmd/network" + "github.com/rancher/os/cmd/power" + "github.com/rancher/os/cmd/respawn" + "github.com/rancher/os/cmd/sysinit" + "github.com/rancher/os/cmd/systemdocker" + "github.com/rancher/os/cmd/userdocker" + "github.com/rancher/os/cmd/wait" + "github.com/rancher/os/config" + osInit "github.com/rancher/os/init" ) func registerCmd(cmd string, mainFunc func()) { diff --git a/os-config.yml b/os-config.yml index 5d794a04..4eff192a 100644 --- a/os-config.yml +++ b/os-config.yml @@ -55,7 +55,7 @@ rancher: address: 127.0.0.1/8 repositories: core: - url: https://raw.githubusercontent.com/rancherio/os-services/v0.4.0 + url: https://raw.githubusercontent.com/rancher/os-services/v0.4.0 state: fstype: auto dev: LABEL=RANCHER_STATE diff --git a/scripts/docker-run.sh b/scripts/docker-run.sh index 37479f47..9296004d 100755 --- a/scripts/docker-run.sh +++ b/scripts/docker-run.sh @@ -6,7 +6,7 @@ if [ -n "$BIND_DIR" ]; then if [ "$BIND_DIR" = "." ]; then BIND_DIR=$(pwd) fi - DOCKER_ARGS="-t -v $BIND_DIR:/go/src/github.com/rancherio/os" + DOCKER_ARGS="-t -v $BIND_DIR:/go/src/github.com/rancher/os" fi if [ -c /dev/kvm ] || [ "${KVM}" == "1" ]; then DOCKER_ARGS="${DOCKER_ARGS} --device=/dev/kvm:/dev/kvm" diff --git a/util/util_test.go b/util/util_test.go index 3f8d9357..53c0679d 100644 --- a/util/util_test.go +++ b/util/util_test.go @@ -190,7 +190,7 @@ func NoTestLoadResourceSimple(t *testing.T) { ` expected = strings.TrimSpace(expected) - b, e := LoadResource("https://raw.githubusercontent.com/rancherio/os-services/v0.3.4/index.yml", true, []string{}) + b, e := LoadResource("https://raw.githubusercontent.com/rancher/os-services/v0.3.4/index.yml", true, []string{}) assert.Nil(e) assert.Equal(expected, strings.TrimSpace(string(b)))