Merge pull request #6 from hypriot/build-like-upstream

build swarm like upstream

.drone.sec

@@ -1 +1 @@
-eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.JHPTWbdsu4USKU0F-C8b_DDNACMoFrvjKC8TMRq809PkSCz7_iux_fuBs-87bbmxxNwhWMnX0MBAhs0naIgNDv5yDHaOHC_VlkXnVuF25iGSPBXzTjmcjLGKR6ekP8y2N4fmfXwv97t1YyUOILV-Y13Pt8bKS4-ITKewiuGiP0M1HXJxRuCvFpektDXQJV1DzUU-jtuftbM1liPTOy0u57EJiVldTOWvbnfYFUQ1IsDqgUp7sFNL2Ej7K0l7r7KqEctQgTH0D9_SV5H9Yype7aIKZR4FiJGuKM6FN29x5v_rEGrbN3mO8Af0vj_GFbT1pDtomFG7uf318v7falFfZw.2rpJWQ8OLuShk0gZ.3kQwlNjT2O_8zkSu2wZo3tz4bq224LiLkkQ-GTQks4jVli589xlRt8Vxayuf1NtrXaJkWT5Tl-zj9RO9zh2OEpNNg-FEpUhdAclfcvb74bLXuLm7zh4qTR_M1XuJ02Kgdh2I5xAJ8zf7b979gIgYa66aIoe_-wyb-or5vmnAD4RzsKAjOkX6Rx-t5JLESvDQokBfoGbFbdcVi27e2xJPUOh3oYgehyPlGDNOPDP0Kp4nkGOyjWuvCL5KC2bG5c3Vl2T2phdoE_hkLbYMZXXX4GaJYJhSZDilfJdWEWzKH62p_ewkVqg2fkkFuF-LCMgqmqD-lK0T8SXInsXhKg9dhE7NrtS4lpCuPC0oVzBxjf0TgXjCTgOGj7nIZgzvhqSLSto1yRPylhWYlGRpwpnDIS0lAcmNToI9Je_3v6PMBW-9zL_gUwFL-eRcWWqk79lFYSZC6lSnnB61EJb-a8cuT-JimboF3WGW5tOqbvVmrC-v325phgy1HU61cTVSzcMxStm0A9RBC9s0qY_xg5SDW5I2WMfY8YJAIwNqca_Q9DfFmMq2iyeIHqEZVllplXfUJJhFvNeN_coz2bHSsWqLMVwOtDT9j7jJXwmUn2LKn9ZC2RmTKwyxEuIwfgdUQVhsi1IJqPJRNWPlHmP6_rlJDjiQwPfMqxpHa7zE2zWqWF5zYGMkwLoNlF7D8F0LcFtUR_HWFXWyvPtM_0HHO5JViwApG9uMfqBEEDrN60SZa922xftsdITpnsUoeWjVS88lzYMVMzlaHg.3mBf0p5UIOxKqNI-zkINnQ
+eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.pWNZABIZ1HMxP8qSpOtsHTTN9L0uZbWTitTzz_GhrQRiVC8tnT9kaD42VNJ3OxWGcMaj-Y8qp4NpbwANyiuQevXbGaoLYX-disJ3EQ9-g8IlwIqM9mIbg6_qQti7Ji6VxnxLJgowS6CKxAycQkI-0XeIAZl64zo5nr0SP1wqZvbt4Wgqr5mH4_Wg4vWeKTBvdpy9A-OSAsFy2gPD3DF4yXYkgAybdjLbK9Sq_6m2nZfftV5AfyDO5bZGgAFDYM9TRviYnB846oUECnvj1g_8n3k_gmTFsIKAQ3nJ-OCpMsDa_NJ6eIPSgR8D79mqSYekWSSRlC8Ec16sZCMN2Tbh3A.-6wt9p12jBRuNUa-.atfkgBFpvQPqGxQW-3z2pzCeCaxZP5LbEVAm_mOY0RnJUG8szWmU3HZZ5urQQBPgooZD6Ha65IOjx3-3CqiZR6hPm3TWKhMJ4a5laHibBQHeayZQG7a5AkLYAxP0ULeIm7WT_nUHKzp9iRq7nzcyFsQm4DMfy4idfmVTsh7WOATru65GkJJtIMl8WdQUP3eqBR5Na5v361_iFHm-t3jssL3cOZ1Cvu1no2JxZ6JM57_Ba0Q_F8NYlSy6Ygw7g229KqaMmi3gulZdPz1VM1swlQNjBo5YSFHCbSh8ssd_UM0osIarx43o0UuRmZkgRkFrlnajDrkDYRpKlHofDeetNUVKtstP3oCIOBc9KGZ8gq0gzWzKqLwlJNcSelwPiKaEs5X6zUhfnm33vrKl4C-dh2wi8zRzc1OstSPTsm0U4w5ZKKWbP5jaUGuK3pRN0o_8V6YWpAYc8c38zQUyH5gxxNDKCUYHYoca_6FpdhLARITOwxls7OzGNaCWc5Axq6I5zVOOVk84kV8Gj3eU9hEPrgWcEpgOgf5Ehi4Z0NhtczVk42Z0ZIDoqKIOHhBJ8jnhIBjzdbnEloUWWdc4EX7RpvkaS6dkdQvojQBo5Z4aA7ImYRt-wGpfAMeuRy7WMz9VDzhKeAuEprNf6zLR4o6RFS4hyExMSZXwU8uiq6ZSsHG0HKdcZGI8nywoffSu9fq2TIyjFSL6_6-fxV5F03_sQytQcsMiE91YWYNesXpj98d8-d4hzi7m3CIcpAj3Bmg1ba_zRVUpZQ.DURyhwzUNTb2W2n1DRVGIg

.drone.yml

@@ -6,19 +6,33 @@ build:
     - export DESCRIPTION="$(cat DESCRIPTION)"
     - export DEPENDENCIES="$(cat DEPENDENCIES)"
     - apt-get update && apt-get install -y mercurial ca-certificates
-    - export VERSION=v1.2.0
+    - export VERSION=v1.2.1
     - git clone --branch ${VERSION} https://github.com/docker/swarm ${GOPATH}/src/github.com/docker/swarm
     - cd ${GOPATH}/src/github.com/docker/swarm
     - go get -v github.com/tools/godep
-#    - go get -v -d github.com/docker/swarm
-    - echo "get dependencies"
-    - git clone -b v1.10.0 https://github.com/docker/docker /drone/src/github.com/docker/docker
-    - go get -v -d ./...
+    - go get github.com/golang/lint/golint
+    - go get github.com/GeertJohan/fgt
+    - script/validate-gofmt
+    - go vet `go list ./... | grep -v /vendor/`
+    - fgt golint ./... | grep -v vendor/ | tee /dev/stderr
+    # Lint shell files and make sure they are not space indented.
+    - fgt find test/ -type f \( -name "*.sh" -or -name "*.bash" -or -name "*.bats" \) -exec grep -Hn -e "^ " {} \;
+    - export GO15VENDOREXPERIMENT=1
+    - export GOARM=6
+    - export GOOS=linux
+#    - go test -v -race `go list ./... | grep -v /vendor/`
+
+    # - go get -v -d github.com/docker/swarm
+    # - echo "get dependencies"
+    # - git clone -b v1.10.0 https://github.com/docker/docker /drone/src/github.com/docker/docker
+    # - go get -v -d ./...
     - echo "start building"
-    - CGO_ENABLED=0 ${GOPATH}/bin/godep go install -v -a -tags netgo -installsuffix netgo -ldflags '-extldflags "-static" -s' .
+    - CGO_ENABLED=0 ${GOPATH}/bin/godep go build -v -a -tags netgo -installsuffix netgo -ldflags '-extldflags "-static" -s' .
     - echo -e "#####\ncreate tar and checksum\n#####"
     - mkdir -p /drone/src/github.com/hypriot/rpi-swarm/content/
-    - cp ${GOPATH}/bin/swarm /drone/src/github.com/hypriot/rpi-swarm/content/
+    # - cp ${GOPATH}/bin/swarm /drone/src/github.com/hypriot/rpi-swarm/content/
+    - ls -lah ${GOPATH}/src/github.com/docker/swarm/
+    - cp ${GOPATH}/src/github.com/docker/swarm/swarm /drone/src/github.com/hypriot/rpi-swarm/content/
     - chmod a+x /drone/src/github.com/hypriot/rpi-swarm/content/swarm
     - cp --parents /etc/ssl/certs/ca-certificates.crt /drone/src/github.com/hypriot/rpi-swarm/content/
     - basename `git rev-parse --show-toplevel`
@@ -34,6 +48,7 @@ build:
     - mkdir -p ${IMAGE_DIR}
     - ln -s ${IMAGE_DIR} /drone/src/buildresult/latest
 
+
 publish:
   docker:
 #    environment:
@@ -43,8 +58,8 @@ publish:
     email: $$DOCKER_EMAIL
     repo: hypriot/rpi-swarm
     tag:
-      - 1.2.0
-      - latest
+      - 1.2.1
+#      - latest
     save:
       file: /drone/src/buildresult/latest/swarm.tar