Merge branch 'test' of http://gitlab.fjmaimaimai.com/mmm-go/opp into test

# Conflicts:
#	Dockerfile

@@ -23,6 +23,7 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
     && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* $HOME/.cache ## 清除缓存
     && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* $HOME/.cache ## 清除缓存
 WORKDIR /root/
 WORKDIR /root/
 COPY --from=builder /go/src/opp .
 COPY --from=builder /go/src/opp .
+
 EXPOSE 8080
 EXPOSE 8080
 EXPOSE 443
 EXPOSE 443
 CMD ["./opp"]
 CMD ["./opp"]

@@ -10,6 +10,9 @@ spec:
     - name: "http"
     - name: "http"
       port: 80
       port: 80
       targetPort: 8080
       targetPort: 8080
+    - name: "https"
+      port: 443
+      targetPort: 443
   selector:
   selector:
     k8s-app: mmmopp
     k8s-app: mmmopp
 ---
 ---
@@ -53,6 +56,7 @@ spec:
               name: mmmjihuitest2-pvc1
               name: mmmjihuitest2-pvc1
           ports:
           ports:
             - containerPort: 8080
             - containerPort: 8080
+            - containerPort: 443
           env:
           env:
             - name: MYSQL_HOST
             - name: MYSQL_HOST
               valueFrom:
               valueFrom: