Skip to content

Commit 233bd9a

Browse files
authored
Merge pull request cnrancher#1 from fyery-chen/fyery
commit the update of zstack driver
2 parents 7339d42 + 46ba952 commit 233bd9a

10 files changed

Lines changed: 452 additions & 109 deletions

File tree

Dockerfile.dapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ENV DOCKER_URL_amd64=http://dev-tool.oss-cn-shenzhen.aliyuncs.com/docker/Linux/x
2323

2424
RUN wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker
2525

26-
ENV DAPPER_SOURCE /go/src/github.com/rancher/docker-machine-driver-zstack/
26+
ENV DAPPER_SOURCE /go/src/github.com/orangedeng/docker-machine-driver-zstack/
2727
ENV DAPPER_OUTPUT ./bin ./dist
2828
ENV DAPPER_DOCKER_SOCKET true
2929
ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ TARGETS := $(shell ls scripts)
22

33
.dapper:
44
@echo Downloading dapper
5+
@echo test
56
@curl -sL http://dev-tool.oss-cn-shenzhen.aliyuncs.com/dapper-`uname -s`-`uname -m`/dapper > .dapper.tmp
67
@@chmod +x .dapper.tmp
78
@./.dapper.tmp -v

main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package main
22

33
import (
44
"github.com/docker/machine/libmachine/drivers/plugin"
5-
"github.com/rancher/docker-machine-driver-zstack/zstack"
5+
"github.com/orangedeng/docker-machine-driver-zstack/zstack"
66
)
77

88
func main() {
9-
plugin.RegisterDriver(zstack.NewDriver())
9+
plugin.RegisterDriver(zstack.NewDriver("",""))
1010
}

vendor/github.com/orangedeng/go-zstack/common/client.go

Lines changed: 24 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/orangedeng/go-zstack/common/types.go

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/orangedeng/go-zstack/instance/client.go

Lines changed: 39 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/orangedeng/go-zstack/instance/fdisk.go

Lines changed: 57 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/orangedeng/go-zstack/instance/offering.go

Lines changed: 23 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/orangedeng/go-zstack/instance/types.go

Lines changed: 21 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)