合并最新开发分支

This commit is contained in:
wulin 2023-10-27 10:55:22 +08:00
parent ce51558fed
commit dae5686777
8 changed files with 6 additions and 6 deletions

BIN
docker/.DS_Store vendored Normal file

Binary file not shown.

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

View File

@ -13,4 +13,4 @@ WORKDIR /home/qiuguo
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"]
CMD ["sh","-c", "java -jar iot-box-user-api.jar --spring.profiles.active=prod"]

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

View File

@ -13,4 +13,4 @@ WORKDIR /home/qiuguo
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"]
CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=prod"]

BIN
docker/qiuguo/.DS_Store vendored Normal file

Binary file not shown.

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

View File

@ -13,4 +13,4 @@ WORKDIR /home/qiuguo
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"]
CMD ["sh","-c", "java -jar iot-gateway.jar --spring.profiles.active=prod"]