tj ipself-web-deployment.yaml

574be611 · 蒋勇 · b9af1356 · 8e8fc914 · 574be611
Commit 574be611 authored Dec 19, 2019 by 蒋勇
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

yamls/zhichan/ipself-web-deployment.yaml
+4 -0

No files found.
--- a/yamls/zhichan/ipself-web-deployment.yaml
+++ b/yamls/zhichan/ipself-web-deployment.yaml
@@ -18,7 +18,11 @@ spec:
      restartPolicy: Always
      containers:
      - name: ipself
+<<<<<<< HEAD
        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:6.0.2
+=======
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:6.0.1
+>>>>>>> 8e8fc9144eb973210b52bc7d020ab311fc0b164e
        imagePullPolicy: IfNotPresent
        ports:
        - containerPort: 80