[integration-test] update Dockerfile for dev and qa

Author: Jimmy-Xu

Dockerfile.centos renamed to Dockerfile.dev

@@ -1,5 +1,6 @@
 FROM centos:7.3.1611
 
+#This Dockerfile is used for dev hypercli
 #REF: integration-cli/README.md
 
 ##########################################################################
@@ -42,7 +43,7 @@ RUN ln -s /go/src/github.com/hyperhq/hypercli /go/src/github.com/docker/docker
 
 WORKDIR /go/src/github.com/hyperhq/hypercli
 VOLUME ["/go/src/github.com/hyperhq/hypercli"]
-ENTRYPOINT ["hack/generate-hyper-conf.sh"]
+ENTRYPOINT ["hack/generate-hyper-conf-dev.sh"]
 
 
 ##########################################################################

Dockerfile.qa

@@ -0,0 +1,40 @@
+FROM centos:7.3.1611
+
+#This Dockerfile is used for autotest hypercli
+#REF: integration-cli/README.md
+
+##########################################################################
+RUN yum install -y\
+ automake\
+ gcc\
+ wget\
+ time\
+ git
+
+
+## Install Go
+ENV GO_VERSION 1.7.4
+RUN wget http://golangtc.com/static/go/${GO_VERSION}/go${GO_VERSION}.linux-amd64.tar.gz
+#RUN wget http://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz
+RUN tar -xzf go${GO_VERSION}.linux-amd64.tar.gz -C /usr/local
+
+## Env
+ENV PATH /go/bin:/usr/local/go/bin:$PATH
+ENV GOPATH /go:/go/src/github.com/hyperhq/hypercli/integration-cli/vendor:/go/src/github.com/hyperhq/hypercli/vendor
+
+ENV HYPER_CONFIG=/root/.hyper
+ENV DOCKER_REMOTE_DAEMON=1
+ENV DOCKER_CERT_PATH=fixtures/hyper_ssl
+ENV DOCKER_TLS_VERIFY=
+
+ENV DOCKER_HOST="tcp://us-west-1.hyper.sh:443"
+ENV BRANCH="master"
+
+ENV ACCESS_KEY=
+ENV SECRET_KEY=
+
+RUN mkdir -p /go/src/github.com/hyperhq
+WORKDIR /go/src/github.com/hyperhq
+
+ADD hack/generate-hyper-conf-qa.sh /generate-hyper-conf-qa.sh
+ENTRYPOINT ["/generate-hyper-conf-qa.sh"]

hack/generate-hyper-conf.sh renamed to hack/generate-hyper-conf-dev.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# set default value of DOCKER_HOST and BRANCH
+if [[ "$DOCKER_HOST" == "" ]];then
+  DOCKER_HOST="tcp://us-west-1.hyper.sh:443"
+fi
+if [[ "$BRANCH" == "" ]];then
+  BRANCH="master"
+fi
+
+
+if [[ "$@" != "./build.sh" ]];then
+    #ensure config for hyper cli
+    mkdir -p ~/.hyper
+    cat > ~/.hyper/config.json <<EOF
+{
+    "clouds": {
+        "${DOCKER_HOST}": {
+            "accesskey": "${ACCESS_KEY}",
+            "secretkey": "${SECRET_KEY}"
+        }
+    }
+}
+EOF
+
+env
+
+echo "========== config git proxy =========="
+if [ "${http_proxy}" != "" ];then
+  git config --global http.proxy ${http_proxy}
+fi
+if [ "${https_proxy}" != "" ];then
+  git config --global https.proxy ${https_proxy}
+fi
+git config --list | grep proxy
+
+echo "========== Clone hypercli repo =========="
+mkdir -p /go/src/github.com/{hyperhq,docker}
+cd /go/src/github.com/hyperhq
+git clone https://github.com/hyperhq/hypercli.git
+
+echo "========== Build hypercli =========="
+cd /go/src/github.com/hyperhq/hypercli
+git checkout $BRANCH
+if [[ $? -ne 0 ]];then
+  echo "Branch $BRANCH not exist!"
+  exit 1
+fi
+./build.sh
+ln -s /go/src/github.com/hyperhq/hypercli /go/src/github.com/docker/docker
+ln -s /go/src/github.com/hyperhq/hypercli/hyper/hyper /usr/bin/hyper
+echo alias hypercli=\"hyper -H \${DOCKER_HOST}\" >> /root/.bashrc
+source /root/.bashrc
+
+echo "##############################################################################################"
+echo "##                               Welcome to integration test env                            ##"
+echo "##############################################################################################"
+#show config for hyper cli
+echo "Current hyper config: ~/.hyper/config.json"
+echo "----------------------------------------------------------------------------------------------"
+cat ~/.hyper/config.json \
+  | sed 's/"secretkey":.*/"secretkey": "******************************"/g' \
+  | sed 's/"auth":.*/"auth": "******************************"/g'
+echo "----------------------------------------------------------------------------------------------"
+
+fi
+
+#execute command
+if [[ $# -ne 0 ]];then
+    cd /go/src/github.com/hyperhq/hypercli/integration-cli && eval $@
+    if [[ "$@" == "./build.sh" ]];then
+    #show make result
+        if [[ $? -eq 0 ]];then
+            echo "OK:)"
+        else
+            echo "Failed:("
+        fi
+    fi
+fi

hack/generate-hyper-conf-qa.sh

@@ -0,0 +1,3 @@
+*.log
+*.bak
+