Эх сурвалжийг харах

docker生成配置修复https启用部分

kindring 2 жил өмнө
parent
commit
2c30b6ee45

+ 1 - 2
docker/gbDocker/Dockerfile

@@ -1,7 +1,6 @@
 FROM ubuntu:20.04
 MAINTAINER kindring
 VOLUME "/data"
-
 ENV  LANG="en_US.utf8"
 # 国标信令端口 tcp与udp同事放行
 EXPOSE 29000/tcp
@@ -21,7 +20,7 @@ ENV PATH ${JAVA_HOME}/bin:$PATH
 # 配置智慧国标平台
 #COPY ./gb28181 /data/hfygb
 # 拷贝配置文件
-COPY ./application_product.yml /data/hfygb/config
+#COPY ./application_product.yml /data/hfygb/config
 WORKDIR /data/hfygb/target
 CMD java -jar hfy-gb.jar  --server.address=0.0.0.0 --spring.config.location=/data/hfygb/config/application_product.yml
 

+ 1 - 1
docker/gbDocker/createConfig.sh

@@ -88,7 +88,7 @@ echo "${t2}# 配置证书可以使用如下两项,如上面二选一即可" >>
 echo "${t2}# PEM 编码证书" >> "$p"
 echo "${t2}certificate: keys/cert.pem" >> "$p"
 echo "${t2}# 私钥文件" >> "$p"
-echo "${t2}# certificate-private-key: keys/key.pem" >> "$p"
+echo "${t2}certificate-private-key: keys/key.pem" >> "$p"
 
 echo "sip:" >> "$p"
 echo "${t1}# [必须修改] 本机的IP, 必须是网卡上的IP,用于sip下协议栈监听ip,如果监听所有设置为0.0.0.0" >> "$p"

+ 2 - 0
docker/installDocker.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+