Skip to content

Commit 34a521f

Browse files
Yuxingorangedeng
Yuxing
authored and
orangedeng
committed
Change owner
1 parent 233bd9a commit 34a521f

30 files changed

Lines changed: 84 additions & 64 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
/dist
44
*.swp
55
/.trash-cache
6+
trash.lock

‎Dockerfile.dapper‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@ RUN apt-get update && \
1414
ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
1515
GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
1616

17-
RUN wget -O - http://dev-tool.oss-cn-shenzhen.aliyuncs.com/golang/go1.7.4.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
18-
go get github.com/rancher/trash && mkdir -p ${GOPATH}/src/golang.org/x/tools && cd ${GOPATH}/src/golang.org/x && tar -xzvf /tmp/tools.tar.gz && go get github.com/golang/lint/golint
19-
17+
RUN wget -O - http://dev-tool.oss-cn-shenzhen.aliyuncs.com/golang/go1.9.6.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
18+
go get github.com/rancher/trash && go get -u golang.org/x/lint/golint
2019
ENV DOCKER_URL_amd64=http://dev-tool.oss-cn-shenzhen.aliyuncs.com/docker/Linux/x86_64/docker-1.10.3 \
2120
DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm \
2221
DOCKER_URL=DOCKER_URL_${ARCH}
2322

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

26-
ENV DAPPER_SOURCE /go/src/github.com/orangedeng/docker-machine-driver-zstack/
25+
ENV DAPPER_SOURCE /go/src/github.com/cnrancher/docker-machine-driver-zstack/
2726
ENV DAPPER_OUTPUT ./bin ./dist
2827
ENV DAPPER_DOCKER_SOCKET true
2928
ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache

‎Makefile‎

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

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

‎main.go‎

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

33
import (
4+
"github.com/cnrancher/docker-machine-driver-zstack/zstack"
45
"github.com/docker/machine/libmachine/drivers/plugin"
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
}

‎scripts/build‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,18 @@ source $(dirname $0)/version
66
cd $(dirname $0)/..
77

88
mkdir -p bin
9-
[ "$(uname)" != "Darwin" ] && LINKFLAGS="-linkmode external -extldflags -static -s"
10-
CGO_ENABLED=0 go build -ldflags "-X main.VERSION=$VERSION $LINKFLAGS" -o bin/docker-machine-driver-zstack
9+
10+
OS_PLATFORM_ARG=(linux darwin)
11+
OS_ARCH_ARG[linux]="amd64"
12+
13+
rm -rf bin/*
14+
for OS in ${OS_PLATFORM_ARG[@]}; do
15+
for ARCH in ${OS_ARCH_ARG[${OS}]}; do
16+
OUTPUT_BIN="bin/$OS/$ARCH/docker-machine-driver-zstack"
17+
if [ "$OS" == "windows" ]; then
18+
OUTPUT_BIN="$OUTPUT_BIN.exe"
19+
fi
20+
echo "Building binary for $OS/$ARCH..."
21+
GOARCH=$ARCH GOOS=$OS CGO_ENABLED=0 go build -o "$OUTPUT_BIN"
22+
done
23+
done

‎scripts/package‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ set -e
33

44
source $(dirname $0)/version
55

6-
ARCH=${ARCH:?"ARCH not set"}
7-
SUFFIX=""
8-
[ "${ARCH}" != "amd64" ] && SUFFIX="_${ARCH}"
6+
cd $(dirname $0)/..
97

10-
cd $(dirname $0)/../package
8+
mkdir -p dist
9+
rm -rf dist/*
1110

12-
TAG=${TAG:-${VERSION}${SUFFIX}}
13-
REPO=${REPO:-rancher}
14-
15-
cp ../bin/docker-machine-driver-zstack .
16-
docker build -t ${REPO}/docker-machine-driver-zstack:${TAG} .
17-
18-
echo Built ${REPO}/docker-machine-driver-zstack:${TAG}
11+
for os in $(ls bin); do
12+
for arch in $(ls bin/$os); do
13+
pushd bin/$os/$arch
14+
tar -czf "docker-machine-driver-zstack.tgz" ./docker-machine-driver-zstack*
15+
popd
16+
mkdir -p dist/$os/$arch
17+
mv bin/$os/$arch/docker-machine-driver-zstack.tgz dist/$os/$arch/docker-machine-driver-zstack.tgz
18+
done
19+
done

‎sources.list‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
deb http://cn.archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse
2-
deb http://cn.archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
3-
deb http://cn.archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe multiverse
4-
deb http://cn.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
5-
deb http://cn.archive.ubuntu.com/ubuntu/ xenial-proposed main restricted universe multiverse
6-
deb-src http://cn.archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse
7-
deb-src http://cn.archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
8-
deb-src http://cn.archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe multiverse
9-
deb-src http://cn.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
10-
deb-src http://cn.archive.ubuntu.com/ubuntu/ xenial-proposed main restricted universe multiverse
11-
deb http://archive.canonical.com/ubuntu/ xenial partner
1+
deb http://mirrors.aliyun.com/ubuntu/ xenial main restricted universe multiverse
2+
deb http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted universe multiverse
3+
deb http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted universe multiverse
4+
deb http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse
5+
##测试版源
6+
deb http://mirrors.aliyun.com/ubuntu/ xenial-proposed main restricted universe multiverse
7+
# 源码
8+
deb-src http://mirrors.aliyun.com/ubuntu/ xenial main restricted universe multiverse
9+
deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted universe multiverse
10+
deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted universe multiverse
11+
deb-src http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse
12+
##测试版源
13+
deb-src http://mirrors.aliyun.com/ubuntu/ xenial-proposed main restricted universe multiverse
14+
# Canonical 合作伙伴和附加
15+
deb http://archive.canonical.com/ubuntu/ xenial partner

‎trash.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# package
2-
github.com/rancher/docker-machine-driver-zstack
2+
github.com/cnrancher/docker-machine-driver-zstack
33

44
github.com/Sirupsen/logrus v0.10.0
55
github.com/docker/machine v0.8.2
6-
github.com/orangedeng/go-zstack master
6+
github.com/cnrancher/go-zstack d49c1dc64072c0346314d4fdbc6f3e43a0df28a7
77
github.com/pkg/errors v0.8.0
88
github.com/docker/docker v1.10.3
99
golang.org/x/crypto beef0f4390813b96e8e68fd78570396d0f4751fc

vendor/github.com/orangedeng/go-zstack/.dockerignore renamed to vendor/github.com/cnrancher/go-zstack/.dockerignore

File renamed without changes.

vendor/github.com/orangedeng/go-zstack/.drone.yml renamed to vendor/github.com/cnrancher/go-zstack/.drone.yml

File renamed without changes.

0 commit comments

Comments
 (0)