From 9774545b6f3b5cb4b2bcea08b7243bb4bba46d91 Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Thu, 22 Jun 2023 16:25:17 +0800 Subject: [PATCH] https://github.com/cskefu/cskefu/issues/833 tune params for redis, switch to java17 --- .circleci/config.yml | 2 +- contact-center/Dockerfile | 2 +- docker-compose.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cc2c2ec..c61ec553 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: # Be sure to update the Docker image tag below to openjdk version of your application. # A list of available CircleCI Docker Convenience Images are available here: https://circleci.com/developer/images/image/cimg/openjdk docker: - - image: cimg/openjdk:11.0 + - image: cimg/openjdk:17.0.7 # Add steps to the job # See: https://circleci.com/docs/configuration-reference/#steps steps: diff --git a/contact-center/Dockerfile b/contact-center/Dockerfile index 5c307b06..93f2cf30 100644 --- a/contact-center/Dockerfile +++ b/contact-center/Dockerfile @@ -1,4 +1,4 @@ -FROM chatopera/java:11 +FROM chatopera/java:17 MAINTAINER Hai Liang Wang # base image is built with config/base/build.sh diff --git a/docker-compose.yml b/docker-compose.yml index 2a722ba8..fd2cde82 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,9 +30,9 @@ services: - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cosinee?useUnicode=true&characterEncoding=UTF-8 - SPRING_DATASOURCE_USERNAME=root - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456} - - SPRING_REDIS_HOST=redis - - SPRING_REDIS_PORT=6379 - - SPRING_REDIS_PASSWORD=${DB_PASSWD:-123456} + - SPRING_DATA_REDIS_HOST=redis + - SPRING_DATA_REDIS_PORT=6379 + - SPRING_DATA_REDIS_PASSWORD=${DB_PASSWD:-123456} - SPRING_ACTIVEMQ_BROKER_URL=tcp://activemq:61616 - CSKEFU_MODULE_CALLOUT=false - CSKEFU_MODULE_CONTACTS=true