Merge pull request #29 from maxzhang1985/dev

Dev
yoyofx · Dec 17, 2019 · a306ede · a306ede
2 parents 06ee7e9 + c8b91ae
commit a306ede
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Examples/SimpleWeb/DOCKERFILE b/Examples/SimpleWeb/DOCKERFILE
@@ -2,7 +2,7 @@ FROM golang
 
 ENV GO111MODULE=on
 ENV CGO_ENABLED 0
-ENV GOPROXY https://goproxy.cn
+ENV GOPROXY https://goproxy.cn,direct
 
 RUN mkdir -p /root/gopath
 RUN mkdir -p /root/gopath/src

diff --git a/Examples/SimpleWeb/scripts/k8s-deploy.yaml b/Examples/SimpleWeb/scripts/k8s-deploy.yaml
@@ -15,8 +15,8 @@ spec:
     spec:
       containers:
         - name: yoyogodemo
-          image: yoyogodemo-dev:v0.0.2
-          imagePullPolicy: Never #just for minikube,do not use this in production!!!
+          image: maxzhang1985/yoyogo:version-1.4.6
+          imagePullPolicy: Always #Always 总是拉取镜像 IfNotPresent 本地有则使用本地镜像,不拉取Never 只使用本地镜像，从不拉取，即使本地没有
           ports:
             - containerPort: 8080
           livenessProbe:
@@ -25,3 +25,6 @@ spec:
               port: 8080
             initialDelaySeconds: 15
             timeoutSeconds: 1
+          env:
+            - name: PROFILE
+              value: "test12"