diff --git a/Dockerfile b/Dockerfile index 94c2eff..b00eca6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ -FROM 192.168.16.17/library/jjdk:1.8.0 -MAINTAINER sunjian@lepudigital.com +#FROM 192.168.16.17/library/jjdk:1.8.0 +FROM openjdk:8-jre-slim +MAINTAINER zhangbo VOLUME /tmp ENV LANG C.UTF-8 RUN mkdir -p /application/app diff --git a/compose/mysql/docker-compose.yml b/compose/mysql/docker-compose.yml index b2f8f80..d082a31 100644 --- a/compose/mysql/docker-compose.yml +++ b/compose/mysql/docker-compose.yml @@ -1,7 +1,7 @@ version : '3' services: mysql_service: - image: 192.168.16.17/library/mysql:5.7 + image: 192.168.31.11/library/mysql:5.7 container_name: mysql_service environment: - "MYSQL_ROOT_PASSWORD=yzcxzsa@1234567" diff --git a/compose/service/docker-compose.yml b/compose/service/docker-compose.yml index 04d7814..9acfa9a 100644 --- a/compose/service/docker-compose.yml +++ b/compose/service/docker-compose.yml @@ -1,7 +1,8 @@ version: '3' services: testplatform_service: - image: 192.168.16.17/library/lepu-test-platform-service:${branch} +# image: 192.168.31.11/library/lepu-test-platform-service:${branch} + image: 180.76.106.6:18081/library/lepu-test-platform-service:${branch} container_name: testplatform_service ports: - "19527:9527" @@ -19,9 +20,9 @@ services: - $SERVICE_DIR/testReports-bak:$SERVICE_DIR/testReports-bak environment: - DB_HOST=$HOST_IP_ADDR - - DB_PORT=3316 + - DB_PORT=3306 - DB_USER=root - - DB_PASSWORD=yzcxzsa@1234567 + - DB_PASSWORD=123456 - DB_NAME=lepu_test_platform - JIRA_DB_HOST=10.0.14.5 - JIRA_DB_PORT=3316 diff --git a/compose/service/env.sh b/compose/service/env.sh index c7907e4..ea3b014 100644 --- a/compose/service/env.sh +++ b/compose/service/env.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash export SERVICE_DIR=/application/app export SERVICE1_VERSION=${branch} -export HOST_IP_ADDR=192.168.16.17 \ No newline at end of file +export HOST_IP_ADDR=180.76.106.6 \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 3a5c2c1..4191631 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - ipPort: 192.168.16.17:19527 + ipPort: 180.76.106.6:19527 port: 9527 servlet: session: