You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by la...@apache.org on 2022/02/18 12:53:56 UTC
[dubbo-go-samples] branch master updated: Update Makefile (#311)
This is an automated email from the ASF dual-hosted git repository.
laurence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/master by this push:
new f1ca227 Update Makefile (#311)
f1ca227 is described below
commit f1ca2279f7ffb5a2a3c5588b9a575385fa1ff90d
Author: Ken.xu <17...@users.noreply.github.com>
AuthorDate: Fri Feb 18 20:53:51 2022 +0800
Update Makefile (#311)
* Update Makefile
修正DOCKER_HOST_IP在Linux下获取报错
* Update docker-compose.yml
升级nacos为最新版本
---
build/Makefile | 8 +++++---
integrate_test/dockercompose/docker-compose.yml | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/build/Makefile b/build/Makefile
index 0860d41..348c6d6 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -38,16 +38,18 @@ LICENSE_DIR = /tmp/tools/license
export GO111MODULE ?= on
export GOSUMDB ?= sum.golang.org
export GOARCH ?= amd64
-
-export DOCKER_HOST_IP = $(shell ifconfig en0 | grep inet | grep -v inet6 | awk '{print $$2}')
+export GONOPROXY ?= **.gitee.com**
OS := $(shell uname)
ifeq ($(OS), Linux)
export GOOS ?= linux
+ export DOCKER_HOST_IP = $(shell ifconfig enp3s0 | grep inet | grep -v inet6 | awk '{print $$2}')
else ifeq ($(OS), Darwin)
export GOOS ?= darwin
+ export DOCKER_HOST_IP = $(shell ifconfig en0 | grep inet | grep -v inet6 | awk '{print $$2}')
else
export GOOS ?= windows
+ export DOCKER_HOST_IP = $(shell ifconfig en0 | grep inet | grep -v inet6 | awk '{print $$2}')
endif
ifeq ($(GOOS), windows)
@@ -164,4 +166,4 @@ integration-java:
@$(info > Running java test $(INTEGRATE_DIR), project name $(PROJECT_NAME))
@chmod +x $(INTEGRATE_DIR)/tests/java/run.sh
@$(shell )$(INTEGRATE_DIR)/tests/java/run.sh $(PROJECT_DIR)/java-client
- @exit $(.SHELLSTATUS)
\ No newline at end of file
+ @exit $(.SHELLSTATUS)
diff --git a/integrate_test/dockercompose/docker-compose.yml b/integrate_test/dockercompose/docker-compose.yml
index f93f6db..28836b0 100644
--- a/integrate_test/dockercompose/docker-compose.yml
+++ b/integrate_test/dockercompose/docker-compose.yml
@@ -10,7 +10,7 @@ services:
restart: on-failure
nacos:
- image: nacos/nacos-server:1.2.0
+ image: nacos/nacos-server:2.0.3-slim
container_name: nacos-standalone
environment:
- PREFER_HOST_MODE=hostname