mirror of
https://github.com/rancher/os.git
synced 2025-08-31 14:23:11 +00:00
Replace rancherio with rancher
Signed-off-by: Wang Long <long.wanglong@huawei.com>
This commit is contained in:
@@ -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
|
||||
|
2
Godeps/Godeps.json
generated
2
Godeps/Godeps.json
generated
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"ImportPath": "github.com/rancherio/os",
|
||||
"ImportPath": "github.com/rancher/os",
|
||||
"GoVersion": "go1.4.1",
|
||||
"Packages": [
|
||||
"./..."
|
||||
|
6
Makefile
6
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
|
||||
|
@@ -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 $@
|
||||
|
||||
|
||||
|
@@ -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 (
|
||||
|
@@ -4,7 +4,7 @@ import (
|
||||
"os"
|
||||
|
||||
"github.com/codegangsta/cli"
|
||||
"github.com/rancherio/os/config"
|
||||
"github.com/rancher/os/config"
|
||||
)
|
||||
|
||||
func Main() {
|
||||
|
@@ -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 {
|
||||
|
@@ -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) {
|
||||
|
@@ -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) {
|
||||
|
@@ -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{
|
||||
|
@@ -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 {
|
||||
|
@@ -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 {
|
||||
|
@@ -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 (
|
||||
|
@@ -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() {
|
||||
|
@@ -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 (
|
||||
|
@@ -4,7 +4,7 @@ import (
|
||||
"os"
|
||||
|
||||
"github.com/codegangsta/cli"
|
||||
"github.com/rancherio/os/config"
|
||||
"github.com/rancher/os/config"
|
||||
)
|
||||
|
||||
func Main() {
|
||||
|
@@ -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() {
|
||||
|
@@ -6,7 +6,7 @@ import (
|
||||
"syscall"
|
||||
|
||||
log "github.com/Sirupsen/logrus"
|
||||
"github.com/rancherio/os/config"
|
||||
"github.com/rancher/os/config"
|
||||
)
|
||||
|
||||
func Main() {
|
||||
|
@@ -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"
|
||||
|
@@ -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() {
|
||||
|
@@ -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) {
|
||||
|
@@ -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"
|
||||
)
|
||||
|
||||
|
@@ -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"
|
||||
)
|
||||
|
@@ -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"
|
||||
|
@@ -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"
|
||||
)
|
||||
|
||||
|
@@ -2,7 +2,7 @@ package docker
|
||||
|
||||
import (
|
||||
dockerClient "github.com/fsouza/go-dockerclient"
|
||||
"github.com/rancherio/os/config"
|
||||
"github.com/rancher/os/config"
|
||||
)
|
||||
|
||||
const (
|
||||
|
@@ -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"
|
||||
)
|
||||
|
||||
|
@@ -5,7 +5,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/docker/libcompose/project"
|
||||
"github.com/rancherio/os/config"
|
||||
"github.com/rancher/os/config"
|
||||
)
|
||||
|
||||
type ConfigEnvironment struct {
|
||||
|
@@ -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"
|
||||
)
|
||||
|
||||
|
@@ -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 {
|
||||
|
@@ -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 {
|
||||
|
@@ -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) {
|
||||
|
@@ -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 (
|
||||
|
@@ -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) {
|
||||
|
@@ -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 {
|
||||
|
22
main.go
22
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()) {
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
@@ -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)))
|
||||
|
Reference in New Issue
Block a user