chore(workflow-cli): change glide to dep

Author: duanhongyi

Dockerfile

@@ -0,0 +1,55 @@
+# Gopkg.toml example
+#
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] #
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+ignored = [
+  "appengine",
+  "appengine/datastore",
+  "appengine/memcache",
+  "appengine/user",
+]
+
+[[constraint]]
+  name = "github.com/arschles/assert"
+  version = "1.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/docopt/docopt-go"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/drycc/controller-sdk-go"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/drycc/pkg"
+
+[[constraint]]
+  name = "gopkg.in/yaml.v2"
+  version = "2.2.1"
+
+[prune]
+  go-tests = true
+  unused-packages = true

Gopkg.lock

@@ -1,5 +1,7 @@
 # the filepath to this repository, relative to $GOPATH/src
-repo_path = github.com/drycc/workflow-cli
+REPO_PATH := github.com/drycc/workflow-cli
+DEV_ENV_IMAGE := quay.io/drycc/go-dev:v0.22.0
+DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 
 HOST_OS := $(shell uname)
 ifeq ($(HOST_OS),Darwin)
@@ -21,54 +23,28 @@ BUILD_ARCH ?=amd64 386
 
 DIST_DIR ?= _dist
 
-define check-static-binary
-  if file $(1) | egrep -q "(statically linked|Mach-O)"; then \
-    echo -n ""; \
-  else \
-    echo "The binary file $(1) is not statically linked. Build canceled"; \
-    exit 1; \
-  fi
-endef
+DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
 
-build: build-test-image
-	$(eval GO_LDFLAGS= -ldflags '-X ${repo_path}/version.Version=dev-${REVISION}')
-	docker run --rm -e GOOS=${GOOS} -v ${CURDIR}/_dist:/out ${IMAGE} go build -a -installsuffix cgo ${GO_LDFLAGS} -o /out/drycc .
-	@$(call check-static-binary,_dist/drycc)
-	@echo "${GOOS} binary written to _dist/drycc"
+define build-install-script
+  sed "s|{{DRYCC-CLIENT-VERSION}}|${GIT_TAG}|g" "install.tmpl" > "${DIST_DIR}/$(1)/install-drycc.sh"
+endef
 
-# This is supposed to be run within a docker container
-build-latest:
-	$(eval GO_LDFLAGS = -ldflags '-X ${repo_path}/version.Version=${GIT_TAG}-${REVISION}')
-	gox -verbose ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="${DIST_DIR}/drycc-latest-{{.OS}}-{{.Arch}}" .
+bootstrap:
+	${DEV_ENV_CMD} dep ensure
 
 # This is supposed to be run within a docker container
 build-revision:
-	$(eval GO_LDFLAGS = -ldflags '-X ${repo_path}/version.Version=${GIT_TAG}-${REVISION}')
-	gox -verbose ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="${DIST_DIR}/${REVISION}/drycc-${REVISION}-{{.OS}}-{{.Arch}}" .
-
-# This is supposed to be run within a docker container
-build-stable:
-	$(eval GO_LDFLAGS = -ldflags '-X ${repo_path}/version.Version=${GIT_TAG}')
-	gox -verbose ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="${DIST_DIR}/drycc-stable-{{.OS}}-{{.Arch}}" .
+	${DEV_ENV_CMD} gox -verbose ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="${DIST_DIR}/${REVISION}/drycc-${REVISION}-{{.OS}}-{{.Arch}}" .
 
 # This is supposed to be run within a docker container
 build-tag:
-	$(eval GO_LDFLAGS = -ldflags '-X ${repo_path}/version.Version=${GIT_TAG}')
-	gox -verbose ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="${DIST_DIR}/${GIT_TAG}/drycc-${GIT_TAG}-{{.OS}}-{{.Arch}}" .
-
-build-all: build-latest build-revision
+	${DEV_ENV_CMD} gox -verbose ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="${DIST_DIR}/${GIT_TAG}/drycc-${GIT_TAG}-{{.OS}}-{{.Arch}}" .
+	@$(call build-install-script,${GIT_TAG})
 
-install:
-	cp drycc $$GOPATH/bin
+build: build-tag build-revision
 
 test-style: build-test-image
-	docker run --rm ${IMAGE} lint
-
-test: build-test-image
-	docker run --rm ${IMAGE} test
-
-build-test-image:
-	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} .
+	${DEV_ENV_CMD} lint
 
-push-test-image: build-test-image
-	docker push ${IMAGE}
+test:
+	${DEV_ENV_CMD} test