diff --git a/Jenkinsfile b/Jenkinsfile index 28441ab..8927ebd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,8 @@ pipeline { agent none // 全局不指定,局部自己声明 environment { - IMAGE_NAME = 'lpt:0.0' - CONTAINER_NAME = 'LPT' + IMAGE_NAME = 'lpt-prod:0.0' + CONTAINER_NAME = 'LPT-prod' HOST_PORT = '5157' CONTAINER_PORT = '5157' } @@ -31,9 +31,9 @@ pipeline { steps { sh ''' docker rm -f $CONTAINER_NAME || true - docker run -d --name $CONTAINER_NAME --network mysql_default \\ + docker run -d --name $CONTAINER_NAME --network prod_mysql-prod \\ --restart=always \\ - -p $HOST_PORT:$CONTAINER_PORT -e SPRING_PROFILES_ACTIVE=dev \\ + -p $HOST_PORT:$CONTAINER_PORT -e SPRING_PROFILES_ACTIVE=prod \\ --log-driver=loki \\ --log-opt loki-url="http://192.168.123.199:3100/loki/api/v1/push" \\ $IMAGE_NAME diff --git a/Jenkinsfile-dev b/Jenkinsfile-dev index 28441ab..2ec0623 100644 --- a/Jenkinsfile-dev +++ b/Jenkinsfile-dev @@ -1,10 +1,10 @@ pipeline { agent none // 全局不指定,局部自己声明 environment { - IMAGE_NAME = 'lpt:0.0' - CONTAINER_NAME = 'LPT' - HOST_PORT = '5157' - CONTAINER_PORT = '5157' + IMAGE_NAME = 'lpt-dev:0.0' + CONTAINER_NAME = 'LPT-dev' + HOST_PORT = '5156' + CONTAINER_PORT = '5156' } stages { stage('Build') { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-prod.yml similarity index 63% rename from src/main/resources/application-dev.yml rename to src/main/resources/application-prod.yml index 6edf93c..c3e7e83 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-prod.yml @@ -2,9 +2,9 @@ spring: # 配置数据库 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://mysql8:3306/learning_progress_tracker?allowPublicKeyRetrieval=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://mysql8:3307/lpt_prod?allowPublicKeyRetrieval=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 username: root - password: GUOxy5157 + password: GUOxy.5157 server: port: 5157