合并最新分支,修改test的docker文件
This commit is contained in:
parent
f71e106009
commit
06746b6dbb
@ -24,7 +24,7 @@ spec:
|
||||
imagePullSecrets:
|
||||
- name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码
|
||||
containers:
|
||||
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-user-api-SNAPSHOT-v$BUILD_NUMBER
|
||||
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-user-api-SNAPSHOT-v1.0.0
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /actuator/health
|
||||
|
||||
@ -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=prod"]
|
||||
CMD ["sh","-c", "java -jar iot-box-user-api.jar --spring.profiles.active=test"]
|
||||
|
||||
@ -24,7 +24,7 @@ spec:
|
||||
imagePullSecrets:
|
||||
- name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码
|
||||
containers:
|
||||
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-websocket-api-SNAPSHOT-v$BUILD_NUMBER
|
||||
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-websocket-api-SNAPSHOT-v1.0.0
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /actuator/health
|
||||
|
||||
@ -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=prod"]
|
||||
CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=test"]
|
||||
|
||||
@ -24,7 +24,7 @@ spec:
|
||||
imagePullSecrets:
|
||||
- name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码
|
||||
containers:
|
||||
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-gateway-SNAPSHOT-v$BUILD_NUMBER
|
||||
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-gateway-SNAPSHOT-v1.0.0
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /actuator/health
|
||||
|
||||
@ -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=prod"]
|
||||
CMD ["sh","-c", "java -jar iot-gateway.jar --spring.profiles.active=test"]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user