diff --git a/Jenkinsfile b/Jenkinsfile index 8c2a609..68a5f0d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -202,36 +202,6 @@ def getComposeFileContent(buildNumber) { return """version: '3.8' services: - mysql: - image: mysql:8.0 - container_name: timeline-mysql - ports: - - "33306:33306" - environment: - MYSQL_ROOT_PASSWORD: WoCloud@9ol7uj - MYSQL_DATABASE: timeline - volumes: - - mysql_data:/var/lib/mysql - - redis: - image: redis:7-alpine - container_name: timeline-redis - ports: - - "36379:6379" - command: redis-server --requirepass 123456 - - minio: - image: minio/minio:latest - container_name: timeline-minio - ports: - - "9000:9000" - - "9001:9001" - environment: - MINIO_ROOT_USER: 9ttSGjvQxek2uKKlhpqI - MINIO_ROOT_PASSWORD: 12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex - command: server /data --console-address ":9001" - volumes: - - minio_data:/data timeline-story-service: image: timeline-registry:5000/timeline-story-service:${buildNumber} @@ -240,17 +210,15 @@ services: - "30001:30001" environment: - server.port=30001 - - spring.datasource.url=jdbc:mysql://mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true + - spring.datasource.url=jdbc:mysql://host.docker.internal:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj - - spring.data.redis.host=redis + - spring.data.redis.host=host.docker.internal - spring.data.redis.port=6379 - - spring.data.redis.password=123456 - file.service.url=http://timeline-file-service:30002/file/ - user.service.url=http://timeline-user-service:30003/user/ - depends_on: - - mysql - - redis + extra_hosts: + - "host.docker.internal:host-gateway" timeline-file-service: image: timeline-registry:5000/timeline-file-service:${buildNumber} @@ -259,16 +227,15 @@ services: - "30002:30002" environment: - server.port=30002 - - spring.datasource.url=jdbc:mysql://mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true + - spring.datasource.url=jdbc:mysql://host.docker.internal:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj - - minio.endpoint=http://minio:9000 + - minio.endpoint=http://host.docker.internal:9000 - minio.accessKey=9ttSGjvQxek2uKKlhpqI - minio.secretKey=12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex - minio.bucketName=timeline-test - depends_on: - - mysql - - minio + extra_hosts: + - "host.docker.internal:host-gateway" timeline-user-service: image: timeline-registry:5000/timeline-user-service:${buildNumber} @@ -277,15 +244,13 @@ services: - "30003:30003" environment: - server.port=30003 - - spring.datasource.url=jdbc:mysql://mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true + - spring.datasource.url=jdbc:mysql://host.docker.internal:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj - - spring.data.redis.host=redis + - spring.data.redis.host=host.docker.internal - spring.data.redis.port=6379 - - spring.data.redis.password=123456 - depends_on: - - mysql - - redis + extra_hosts: + - "host.docker.internal:host-gateway" timeline-gateway-service: image: timeline-registry:5000/timeline-gateway-service:${buildNumber} @@ -308,18 +273,16 @@ services: - spring.cloud.gateway.routes[2].filters[0]=StripPrefix=0 - spring.cloud.gateway.routes[3].id=user-service-ws - spring.cloud.gateway.routes[3].uri=http://timeline-user-service:30003 - - spring.cloud.gateway.routes[3].predicates[0]=Path=/user/ws/** - spring.cloud.gateway.routes[3].filters[0]=StripPrefix=0 - - spring.datasource.url=jdbc:mysql://mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true + - spring.datasource.url=jdbc:mysql://host.docker.internal:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj depends_on: - timeline-story-service - timeline-file-service - timeline-user-service + extra_hosts: + - "host.docker.internal:host-gateway" -volumes: - mysql_data: - minio_data: """ }