Merge remote-tracking branch 'origin/master'

k8s.yaml

@@ -1,130 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-    annotations: {}
-    labels:
-        k8s.kuboard.cn/layer: svc
-        k8s.kuboard.cn/name: sqtocc
-    name: sqtocc
-    namespace: default
-    resourceVersion: '12905861'
-spec:
-    progressDeadlineSeconds: 600
-    replicas: 1
-    revisionHistoryLimit: 10
-    selector:
-        matchLabels:
-            k8s.kuboard.cn/layer: svc
-            k8s.kuboard.cn/name: sqtocc
-    strategy:
-        rollingUpdate:
-            maxSurge: 25%
-            maxUnavailable: 25%
-        type: RollingUpdate
-    template:
-        metadata:
-            creationTimestamp: null
-            labels:
-                k8s.kuboard.cn/layer: svc
-                k8s.kuboard.cn/name: sqtocc
-        spec:
-            containers:
-                - command:
-                      - nohup
-                      - java
-                      - '-jar'
-                      - '-Druoyi.name=YJZH_SQ'
-                      - '-Dserver.port=8080'
-                      - '-Dspring.profiles.active=dev'
-                      - app.jar
-                      - '>/dev/null'
-                      - 2>&1
-                      - '&'
-                  image: '200.200.19.125:5000/docker_r/yjzh_server:latest'
-                  imagePullPolicy: Always
-                  name: sqtocc
-                  ports:
-                      - containerPort: 8080
-                        name: p1
-                        protocol: TCP
-                      - containerPort: 8081
-                        name: p2
-                        protocol: TCP
-                      - containerPort: 8082
-                        name: p3
-                        protocol: TCP
-                  resources: {}
-                  terminationMessagePath: /dev/termination-log
-                  terminationMessagePolicy: File
-                  volumeMounts:
-                      - mountPath: /sys/fs/cgroup
-                        name: volume-454ed
-            dnsPolicy: ClusterFirst
-            imagePullSecrets:
-                - name: docker-harbor
-            restartPolicy: Always
-            schedulerName: default-scheduler
-            securityContext: {}
-            terminationGracePeriodSeconds: 30
-            volumes:
-                - name: volume-454ed
-                  persistentVolumeClaim:
-                      claimName: sqtoccfile
-status:
-    availableReplicas: 1
-    conditions:
-        - lastTransitionTime: '2021-11-24T08:45:08Z'
-          lastUpdateTime: '2021-11-24T08:45:08Z'
-          message: Deployment has minimum availability.
-          reason: MinimumReplicasAvailable
-          status: 'True'
-          type: Available
-        - lastTransitionTime: '2021-11-24T08:44:46Z'
-          lastUpdateTime: '2021-11-24T08:58:59Z'
-          message: ReplicaSet "sqtocc-c874cc88d" has successfully progressed.
-          reason: NewReplicaSetAvailable
-          status: 'True'
-          type: Progressing
-    observedGeneration: 2
-    readyReplicas: 1
-    replicas: 1
-    updatedReplicas: 1
-
----
-apiVersion: v1
-kind: Service
-metadata:
-    annotations: {}
-    labels:
-        k8s.kuboard.cn/layer: svc
-        k8s.kuboard.cn/name: sqtocc
-    name: sqtocc
-    namespace: default
-    resourceVersion: '12906304'
-spec:
-    clusterIP: 10.1.170.68
-    clusterIPs:
-        - 10.1.170.68
-    externalTrafficPolicy: Cluster
-    internalTrafficPolicy: Cluster
-    ipFamilies:
-        - IPv4
-    ipFamilyPolicy: SingleStack
-    ports:
-        - name: rpty3k
-          nodePort: 32004
-          port: 8080
-          protocol: TCP
-          targetPort: 8080
-    selector:
-        k8s.kuboard.cn/layer: svc
-        k8s.kuboard.cn/name: sqtocc
-    sessionAffinity: ClientIP
-    sessionAffinityConfig:
-        clientIP:
-            timeoutSeconds: 10800
-    type: NodePort
-status:
-    loadBalancer: {}
-

ruoyi-admin/Dockerfile

@@ -9,6 +9,12 @@ WORKDIR /xintong/server
 EXPOSE 8080
 ADD ./target/ruoyi-admin.jar ./app.jar
 ADD start.sh ./start.sh
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories \
+    && apk add --no-cache tzdata \
+    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata \
+    && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* $HOME/.cache
 RUN chmod +x ./start.sh
 ENTRYPOINT ["./start.sh"]
 

ruoyi-admin/start.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # 命令后加入 & ，保持程序后台持续运行
-nohup java -jar -Druoyi.name=YJZH_SQ -Dserver.port=8080 -Dspring.profiles.active=test app.jar >/dev/null 2>&1 &
+nohup java -jar -Druoyi.name=YJZH_SQ -Dserver.port=8080 -Dspring.profiles.active=dev app.jar >/dev/null 2>&1 &
 
 # 死循环，保持docker前台运行
 while [[ true ]]; do