diff --git a/.travis.yml b/.travis.yml index ba743167e43b64c342b668a43f0bdf2ca7a021eb..434279d04aea15d4b4ed32b103b22368ac3d4b2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ install: true # define ci-stage script: + - COMMITID=$(git rev-parse HEAD) # license-check # start zookeeper registry insecure listen in [:]:2181 - echo 'start license check' @@ -31,8 +32,8 @@ script: # start zookeeper registry insecure listen in [:]:2181 - docker run -d --network host zookeeper - ROOTDIR=$(pwd) - - cd ./test/integrate/dubbo/go-client && docker build . -t ci-consumer && cd $ROOTDIR - - cd ./test/integrate/dubbo/go-server && docker build . -t ci-provider && cd $ROOTDIR + - cd ./test/integrate/dubbo/go-client && docker build . -t ci-consumer --build-arg COMMITID=${COMMITID} && cd $ROOTDIR + - cd ./test/integrate/dubbo/go-server && docker build . -t ci-provider --build-arg COMMITID=${COMMITID} && cd $ROOTDIR - docker run -d --network host ci-provider - docker run -it --network host ci-consumer diff --git a/test/integrate/dubbo/go-client/Dockerfile b/test/integrate/dubbo/go-client/Dockerfile index 89d05498031dec256cbdd24e4f41b80a32c396b1..0f124a6e7b84cb8e76c5a0b6cbd1005f03101ce2 100644 --- a/test/integrate/dubbo/go-client/Dockerfile +++ b/test/integrate/dubbo/go-client/Dockerfile @@ -7,8 +7,12 @@ WORKDIR /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-client ENV CONF_CONSUMER_FILE_PATH "client.yml" ENV APP_LOG_CONF_FILE "log.yml" +ARG COMMITID + ADD . /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-client +RUN go get -u github.com/apache/dubbo-go@ARG + RUN go install github.com/apache/dubbo-go/test/integrate/dubbo/go-client CMD go-client \ No newline at end of file diff --git a/test/integrate/dubbo/go-server/Dockerfile b/test/integrate/dubbo/go-server/Dockerfile index 004f5506999f7f2978ff997a78772ccf5d00fb4e..91839f79427a352fa2eebca879cf6ce6d6bd6727 100644 --- a/test/integrate/dubbo/go-server/Dockerfile +++ b/test/integrate/dubbo/go-server/Dockerfile @@ -7,8 +7,12 @@ WORKDIR /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-server ENV CONF_PROVIDER_FILE_PATH "server.yml" ENV APP_LOG_CONF_FILE "log.yml" +ARG COMMITID + ADD . /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-server +RUN go get -u github.com/apache/dubbo-go@ARG + RUN go install github.com/apache/dubbo-go/test/integrate/dubbo/go-server CMD go-server