From 96339f425cb5fc6ccb5ea5374d674c0aae0b350e Mon Sep 17 00:00:00 2001 From: lexluo09 <39718951+lexluo09@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:31:58 +0800 Subject: [PATCH] (improvement)(project) Chroma supports storing and modifying Docker image paths. The Java backend service has been enhanced with a MySQL client and name modification. (#1303) --- docker/Dockerfile | 5 +++++ docker/docker-build.bat | 2 +- docker/docker-build.sh | 2 +- docker/docker-compose.yml | 7 +++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9ecf948b3..b07d86862 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,6 +7,11 @@ WORKDIR /usr/src/app # Argument to pass in the supersonic version at build time ARG SUPERSONIC_VERSION +# Install necessary packages, including MySQL client +RUN apt-get update && \ + apt-get install -y default-mysql-client unzip && \ + rm -rf /var/lib/apt/lists/* + # Install the vim editor. RUN apt-get update && \ apt-get install -y vim && \ diff --git a/docker/docker-build.bat b/docker/docker-build.bat index ae63c603a..abbc600cc 100644 --- a/docker/docker-build.bat +++ b/docker/docker-build.bat @@ -15,7 +15,7 @@ REM Function to build the Docker image :build_docker_image set "version=%1" echo Building Docker image: supersonic:%version% -docker build --no-cache --build-arg SUPERSONIC_VERSION=%version% -t supersonic:%version% -f docker\Dockerfile . +docker build --no-cache --build-arg SUPERSONIC_VERSION=%version% -t supersonicbi/supersonic:%version% -f docker\Dockerfile . if %errorlevel% neq 0 ( echo Docker build failed. Exiting. exit /b 1 diff --git a/docker/docker-build.sh b/docker/docker-build.sh index 5539254a3..14e42c233 100644 --- a/docker/docker-build.sh +++ b/docker/docker-build.sh @@ -10,7 +10,7 @@ execute_build_script() { build_docker_image() { local version=$1 echo "Building Docker image: supersonic:$version" - docker build --no-cache --build-arg SUPERSONIC_VERSION=$version -t supersonic:$version -f docker/Dockerfile . + docker build --no-cache --build-arg SUPERSONIC_VERSION=$version -t supersonicbi/supersonic:$version -f docker/Dockerfile . if [ $? -ne 0 ]; then echo "Docker build failed. Exiting." exit 1 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d66042d8a..f271de5bd 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -44,15 +44,17 @@ services: container_name: supersonic_chroma ports: - "8000:8000" + volumes: + - chroma_data:/chroma networks: - supersonic_network dns: - 8.8.8.8 - 8.8.4.4 - java_backend: + supersonic_standalone: image: supersonicbi/supersonic:0.9.2-SNAPSHOT - container_name: supersonic_java_backend + container_name: supersonic_standalone environment: DB_HOST: supersonic_mysql DB_NAME: supersonic_db @@ -72,6 +74,7 @@ services: volumes: mysql_data: + chroma_data: networks: supersonic_network: \ No newline at end of file