Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
22a7f0099
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Summer2022
22a7f0099
Commits
2ef87f9d
Commit
2ef87f9d
authored
4 years ago
by
scott.wang
Browse files
Options
Downloads
Patches
Plain Diff
Fix dockerfile and build the latest code
parent
e77f9447
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+2
-4
2 additions, 4 deletions
.travis.yml
test/integrate/dubbo/go-client/Dockerfile
+6
-2
6 additions, 2 deletions
test/integrate/dubbo/go-client/Dockerfile
test/integrate/dubbo/go-server/Dockerfile
+5
-2
5 additions, 2 deletions
test/integrate/dubbo/go-server/Dockerfile
with
13 additions
and
8 deletions
.travis.yml
+
2
−
4
View file @
2ef87f9d
...
...
@@ -22,16 +22,14 @@ script:
-
echo ${TRAVIS_PULL_REQUEST_SLUG}
-
echo ${TRAVIS_PULL_REQUEST_SHA}
-
echo ${TRAVIS_REPO_SLUG}
-
exit
1
# license-check
# start zookeeper registry insecure listen in [:]:2181
-
echo 'start integrate-test'
# start zookeeper registry insecure listen in [:]:2181
-
docker run -d --network host zookeeper
-
ROOTDIR=$(pwd)
-
echo ${TRAVIS_COMMIT} ${ROOTDIR}
-
cd ./test/integrate/dubbo/go-client && docker build . -t ci-consumer --build-arg COMMITID=${TRAVIS_COMMIT} && cd $ROOTDIR
-
cd ./test/integrate/dubbo/go-server && docker build . -t ci-provider --build-arg COMMITID=${TRAVIS_COMMIT} && cd $ROOTDIR
-
cd ./test/integrate/dubbo/go-client && docker build . -t ci-consumer --build-arg PR_ORIGIN_REPO=${TRAVIS_PULL_REQUEST_SLUG} PR_ORIGIN_COMMITID=${TRAVIS_PULL_REQUEST_SHA} && cd $ROOTDIR
-
cd ./test/integrate/dubbo/go-server && docker build . -t ci-provider --build-arg PR_ORIGIN_REPO=${TRAVIS_PULL_REQUEST_SLUG} PR_ORIGIN_COMMITID=${TRAVIS_PULL_REQUEST_SHA} && cd $ROOTDIR
-
docker run -d --network host ci-provider
-
docker run -it --network host ci-consumer
-
exit
0
...
...
This diff is collapsed.
Click to expand it.
test/integrate/dubbo/go-client/Dockerfile
+
6
−
2
View file @
2ef87f9d
...
...
@@ -7,11 +7,15 @@ 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
ARG
PR_ORIGIN_REPO
ARG
PR_ORIGIN_COMMITID
ADD
. /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-client
# update dubbo-go to current commit id
RUN
go get
-u
github.com/apache/dubbo-go@
${
COMMITID
}
RUN
echo
"github.com/apache/dubbo-go will be replace to github.com/
${
PR_ORIGIN_REPO
}
@
${
PR_ORIGIN_COMMITID
}
"
RUN
go mod edit
-replace
=
github.com/apache/dubbo-go
=
github.com/
${
PR_ORIGIN_REPO
}
@
${
PR_ORIGIN_COMMITID
}
RUN
go
install
github.com/apache/dubbo-go/test/integrate/dubbo/go-client
CMD
go-client
\ No newline at end of file
This diff is collapsed.
Click to expand it.
test/integrate/dubbo/go-server/Dockerfile
+
5
−
2
View file @
2ef87f9d
...
...
@@ -7,11 +7,14 @@ 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
ARG
PR_ORIGIN_REPO
ARG
PR_ORIGIN_COMMITID
ADD
. /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-server
# update dubbo-go to current commit id
RUN
go get
-u
github.com/apache/dubbo-go@
${
COMMITID
}
RUN
echo
"github.com/apache/dubbo-go will be replace to github.com/
${
PR_ORIGIN_REPO
}
@
${
PR_ORIGIN_COMMITID
}
"
RUN
go mod edit
-replace
=
github.com/apache/dubbo-go
=
github.com/
${
PR_ORIGIN_REPO
}
@
${
PR_ORIGIN_COMMITID
}
RUN
go
install
github.com/apache/dubbo-go/test/integrate/dubbo/go-server
CMD
go-server
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment