From 1f52032ebce8d81941fc2a5f3f003de08892033c Mon Sep 17 00:00:00 2001
From: "scott.wang" <scottwangsxll@gmail.com>
Date: Tue, 19 May 2020 15:13:33 +0800
Subject: [PATCH] Add ci used current commit id
---
.travis.yml | 5 +++--
test/integrate/dubbo/go-client/Dockerfile | 4 ++++
test/integrate/dubbo/go-server/Dockerfile | 4 ++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ba743167e..434279d04 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 89d054980..0f124a6e7 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 004f55069..91839f794 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
--
GitLab