Skip to content

Commit ee0bec3

Browse files
chickenljchickenlj
committed
update dockerfile
1 parent 3fdfbdb commit ee0bec3

File tree

21 files changed

+468
-156
lines changed

21 files changed

+468
-156
lines changed

‎online_boutique_demo/release/kubernetes-manifests.yaml‎

Lines changed: 382 additions & 123 deletions
Large diffs are not rendered by default.

‎online_boutique_demo/src/adservive/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ build:
3838
.PHONY: docker
3939
docker:
4040
@docker build -t adservice:latest .
41-
@docker tag adservice:latest xpunch/dubbo-go-demo-adservice:v1.0.0
42-
@docker push xpunch/dubbo-go-demo-adservice:v1.0.0
41+
@docker tag adservice:latest sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-ad-service:1.0-go
42+
@docker push sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-ad-service:1.0-go

‎online_boutique_demo/src/adservive/main.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,20 @@ import (
2525
"github.com/apache/dubbo-go-samples/online_boutique_demo/adservice/handler"
2626
hipstershop "github.com/apache/dubbo-go-samples/online_boutique_demo/adservice/proto"
2727
"github.com/dubbogo/gost/log/logger"
28+
"os"
2829
)
2930

3031
func main() {
32+
regAddr := os.Getenv("DUBBO_REGISTRY_ADDRESS")
33+
if regAddr == "" {
34+
regAddr = "127.0.0.1:2181"
35+
}
36+
3137
ins, err := dubbo.NewInstance(
3238
dubbo.WithName("adservice"),
3339
dubbo.WithRegistry(
3440
registry.WithZookeeper(),
35-
registry.WithAddress("127.0.0.1:2181"),
41+
registry.WithAddress(regAddr),
3642
),
3743
dubbo.WithProtocol(
3844
protocol.WithTriple(),

‎online_boutique_demo/src/cartservice/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ build:
3737

3838
.PHONY: docker
3939
docker:
40-
@docker build -t cartservice:latest .
41-
@docker tag cartservice:latest xpunch/dubbo-go-demo-cartservice:v1.0.0
42-
@docker push xpunch/dubbo-go-demo-cartservice:v1.0.0
40+
@docker build -t cartService:latest .
41+
@docker tag cartservice:latest sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-cart-service:1.0-go
42+
@docker push sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-cart-service:1.0-go

‎online_boutique_demo/src/cartservice/main.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,20 @@ import (
2626
hipstershop "github.com/apache/dubbo-go-samples/online_boutique_demo/cartservice/proto"
2727
"github.com/dubbogo/gost/log/logger"
2828
_ "github.com/dubbogo/gost/log/logger"
29+
"os"
2930
)
3031

3132
func main() {
33+
regAddr := os.Getenv("DUBBO_REGISTRY_ADDRESS")
34+
if regAddr == "" {
35+
regAddr = "127.0.0.1:2181"
36+
}
3237

3338
ins, err := dubbo.NewInstance(
3439
dubbo.WithName("cartservice"),
3540
dubbo.WithRegistry(
3641
registry.WithZookeeper(),
37-
registry.WithAddress("127.0.0.1:2181"),
42+
registry.WithAddress(regAddr),
3843
),
3944
dubbo.WithProtocol(
4045
protocol.WithTriple(),

‎online_boutique_demo/src/checkoutservice/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ build:
3838
.PHONY: docker
3939
docker:
4040
@docker build -t checkoutservice:latest .
41-
@docker tag checkoutservice:latest xpunch/dubbo-go-demo-checkoutservice:v1.0.0
42-
@docker push xpunch/dubbo-go-demo-checkoutservice:v1.0.0
41+
@docker tag checkoutservice:latest sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-checkout-service:1.0-go
42+
@docker push sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-checkout-service:1.0-go

‎online_boutique_demo/src/checkoutservice/main.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/apache/dubbo-go-samples/online_boutique_demo/checkoutservice/handler"
2626
pb "github.com/apache/dubbo-go-samples/online_boutique_demo/checkoutservice/proto"
2727
"github.com/dubbogo/gost/log/logger"
28+
"os"
2829
)
2930

3031
var (
@@ -33,12 +34,16 @@ var (
3334
)
3435

3536
func main() {
37+
regAddr := os.Getenv("DUBBO_REGISTRY_ADDRESS")
38+
if regAddr == "" {
39+
regAddr = "127.0.0.1:2181"
40+
}
3641

3742
ins, err := dubbo.NewInstance(
3843
dubbo.WithName(name),
3944
dubbo.WithRegistry(
4045
registry.WithZookeeper(),
41-
registry.WithAddress("127.0.0.1:2181"),
46+
registry.WithAddress(regAddr),
4247
),
4348
dubbo.WithProtocol(
4449
protocol.WithTriple(),

‎online_boutique_demo/src/currencyservice/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ build:
3838
.PHONY: docker
3939
docker:
4040
@docker build -t currencyservice:latest .
41-
@docker tag currencyservice:latest xpunch/dubbo-go-demo-currencyservice:v1.0.0
42-
@docker push xpunch/dubbo-go-demo-currencyservice:v1.0.0
41+
@docker tag currencyservice:latest sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-currency-service:1.0-go
42+
@docker push sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-currency-service:1.0-go

‎online_boutique_demo/src/currencyservice/main.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,20 @@ import (
2525
"github.com/apache/dubbo-go-samples/online_boutique_demo/currencyservice/handler"
2626
hipstershop "github.com/apache/dubbo-go-samples/online_boutique_demo/currencyservice/proto"
2727
"github.com/dubbogo/gost/log/logger"
28+
"os"
2829
)
2930

3031
func main() {
32+
regAddr := os.Getenv("DUBBO_REGISTRY_ADDRESS")
33+
if regAddr == "" {
34+
regAddr = "127.0.0.1:2181"
35+
}
3136

3237
ins, err := dubbo.NewInstance(
3338
dubbo.WithName("currencyservice"),
3439
dubbo.WithRegistry(
3540
registry.WithZookeeper(),
36-
registry.WithAddress("127.0.0.1:2181"),
41+
registry.WithAddress(regAddr),
3742
),
3843
dubbo.WithProtocol(
3944
protocol.WithTriple(),

‎online_boutique_demo/src/emailservice/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ build:
3838
.PHONY: docker
3939
docker:
4040
@docker build -t emailservice:latest .
41-
@docker tag emailservice:latest xpunch/dubbo-go-demo-emailservice:v1.0.0
42-
@docker push xpunch/dubbo-go-demo-emailservice:v1.0.0
41+
@docker tag emailservice:latest sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-email-service:1.0-go
42+
@docker push sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-email-service:1.0-go

0 commit comments

Comments
 (0)