Merge branch 'master' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期

This commit is contained in:
wulin 2023-10-24 10:37:07 +08:00
commit 27596fd963
6 changed files with 32 additions and 57 deletions

View File

@ -24,7 +24,7 @@ spec:
imagePullSecrets:
- name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码
containers:
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-user-api-SNAPSHOT-v1.0.0
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-user-api-SNAPSHOT-v$BUILD_NUMBER
readinessProbe:
httpGet:
path: /actuator/health
@ -38,14 +38,24 @@ spec:
- containerPort: 8080
protocol: TCP
resources:
requests: #资源请求的设置
cpu: 0m #Cpu请求容器启动的初始可用数量
memory: 600Mi #内存清楚,容器启动的初始可用数量
limits:
cpu: 100m
cpu: 80m
memory: 600Mi
volumeMounts:
- mountPath: /home/qiuguo/logs
name: iot-logs
terminationMessagePath: /nfs/data/qiuguo/iot/logs
terminationMessagePolicy: File
dnsPolicy: ClusterFirst
restartPolicy: Always
terminationGracePeriodSeconds: 30
volumes:
- name: iot-logs
hostPath:
path: /nfs/data/qiuguo/iot/logs
---
apiVersion: v1
kind: Service

View File

@ -1,16 +0,0 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER qiuguo
# 挂载目录
VOLUME /home/qiuguo
# 创建目录
RUN mkdir -p /home/qiuguo
# 指定路径
WORKDIR /home/qiuguo
# 复制jar文件到路径
COPY ./jar/iot-box-user-api.jar /home/qiuguo/iot-box-user-api.jar
# 启动网关服务
#ENTRYPOINT ["java","-jar","iot-box-user-api.jar"]
CMD ["sh","-c", "java -jar iot-box-user-api.jar --spring.profiles.active=test"]

View File

@ -24,7 +24,7 @@ spec:
imagePullSecrets:
- name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码
containers:
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-websocket-api-SNAPSHOT-v1.0.0
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-websocket-api-SNAPSHOT-v$BUILD_NUMBER
readinessProbe:
httpGet:
path: /actuator/health
@ -38,14 +38,24 @@ spec:
- containerPort: 8080
protocol: TCP
resources:
requests: #资源请求的设置
cpu: 0m #Cpu请求容器启动的初始可用数量
memory: 600Mi #内存清楚,容器启动的初始可用数量
limits:
cpu: 100m
cpu: 80m
memory: 600Mi
volumeMounts:
- mountPath: /home/qiuguo/logs
name: iot-logs
terminationMessagePath: /nfs/data/qiuguo/iot/logs
terminationMessagePolicy: File
dnsPolicy: ClusterFirst
restartPolicy: Always
terminationGracePeriodSeconds: 30
volumes:
- name: iot-logs
hostPath:
path: /nfs/data/qiuguo/iot/logs
---
apiVersion: v1
kind: Service

View File

@ -1,16 +0,0 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER qiuguo
# 挂载目录
VOLUME /home/qiuguo
# 创建目录
RUN mkdir -p /home/qiuguo
# 指定路径
WORKDIR /home/qiuguo
# 复制jar文件到路径
COPY ./jar/iot-box-websocket-api.jar /home/qiuguo/iot-box-websocket-api.jar
# 启动网关服务
#ENTRYPOINT ["java","-jar","iot-box-websocket-api.jar"]
CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=test"]

View File

@ -24,7 +24,7 @@ spec:
imagePullSecrets:
- name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码
containers:
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-gateway-SNAPSHOT-v1.0.0
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-gateway-SNAPSHOT-v$BUILD_NUMBER
readinessProbe:
httpGet:
path: /actuator/health
@ -37,15 +37,18 @@ spec:
ports:
- containerPort: 8080
protocol: TCP
resources:
limits:
cpu: 100m
memory: 600Mi
volumeMounts:
- mountPath: /home/qiuguo/logs
name: iot-logs
terminationMessagePath: /nfs/data/qiuguo/iot/logs
terminationMessagePolicy: File
dnsPolicy: ClusterFirst
restartPolicy: Always
terminationGracePeriodSeconds: 30
volumes:
- name: iot-logs
hostPath:
path: /nfs/data/qiuguo/iot/logs
---
apiVersion: v1
kind: Service

View File

@ -1,16 +0,0 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER qiuguo
# 挂载目录
VOLUME /home/qiuguo
# 创建目录
RUN mkdir -p /home/qiuguo
# 指定路径
WORKDIR /home/qiuguo
# 复制jar文件到路径
COPY ./jar/iot-gateway.jar /home/qiuguo/iot-gateway.jar
# 启动网关服务
#ENTRYPOINT ["java","-jar","iot-gateway.jar"]
CMD ["sh","-c", "java -jar iot-gateway.jar --spring.profiles.active=test"]