Commit 00dfa71d authored by 张磊涛's avatar 张磊涛 💬

Merge branch 'dev' into 'master'

Dev

See merge request apaas/apaas-meshproxy!1
parents 60d1646b 3813f0f5
...@@ -37,7 +37,7 @@ pipeline: ...@@ -37,7 +37,7 @@ pipeline:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
base: registry.cn-qingdao.aliyuncs.com/wod/debian-arm64:buster-slim base: registry.cn-qingdao.aliyuncs.com/wod/busybox-arm64:1.32.0-glibc
repo: wod/apaas-meshproxy-arm64 repo: wod/apaas-meshproxy-arm64
dockerfile: build/arm.dockerfile dockerfile: build/arm.dockerfile
version: "v3.0.0" version: "v3.0.0"
......
...@@ -22,7 +22,7 @@ var ( ...@@ -22,7 +22,7 @@ var (
redisUrl = pflag.String("redisUrl", "redis://apaas-redis.apaas-v3:6379", "") redisUrl = pflag.String("redisUrl", "redis://apaas-redis.apaas-v3:6379", "")
redisTag = pflag.String("redisTag", "apaas-mesh-proxy", "") redisTag = pflag.String("redisTag", "apaas-mesh-proxy", "")
confPath = pflag.String("confPath", "/app/config/proxy.json", "") confPath = pflag.String("confPath", "/app/config/proxy.json", "")
dbURL = pflag.String("dbURL", "host=apaas-postgis.apaas-v3 port=5432 user=postgres password=passwd123 dbname=apaas sslmode=disable", "") dbURL = pflag.String("dbURL", "host=stolon-proxy.devops port=5432 user=postgres password=spaceIN511 dbname=apaas sslmode=disable", "")
dbDriverName = pflag.String("dbDriverName", "postgres", "") dbDriverName = pflag.String("dbDriverName", "postgres", "")
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment