From 2cdd8ec17c5782c05e8321d48735e4c3f3de6f6b Mon Sep 17 00:00:00 2001 From: Eric <132873174+eric-epsilla@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:28:55 +0800 Subject: [PATCH 1/6] Update Dockerfile --- engine/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/Dockerfile b/engine/Dockerfile index a2e29f2..146ea77 100644 --- a/engine/Dockerfile +++ b/engine/Dockerfile @@ -1,4 +1,4 @@ -FROM epsilla/base as builder +FROM epsilla/ubuntu as builder ADD ./ /vectordb WORKDIR /vectordb ENV OATPP_INSTALL_PATH=/vectordb/build/dependencies @@ -7,7 +7,7 @@ RUN mkdir -p /vectordb/build && cd /vectordb/build && cmake .. && make && chmod chmod +x /usr/local/bin/geesefs && /usr/local/bin/geesefs -v -FROM epsilla/base +FROM epsilla/ubuntu ARG TARGETARCH ARG RELEASE_VERSION=latest ENV ENV_RELEASE_VERSION=$RELEASE_VERSION @@ -15,7 +15,7 @@ COPY --from=builder /vectordb/build/vectordb /vectordb COPY --from=builder /usr/local/bin/geesefs /usr/local/bin/geesefs -FROM epsilla/base +FROM epsilla/ubuntu ARG TARGETARCH ARG RELEASE_VERSION=latest ENV ENV_RELEASE_VERSION=$RELEASE_VERSION From de57611522dc873245387bac731593c86ec354eb Mon Sep 17 00:00:00 2001 From: Eric <132873174+eric-epsilla@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:30:27 +0800 Subject: [PATCH 2/6] Update build-dev.yml --- .github/workflows/build-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 593b8c0..c3befb4 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -2,7 +2,7 @@ name: Build Vectordb in dev on: push: - branches: [ "dev", "distritubed-*" ] + branches: [ "dev", "distritubed-*", "docker" ] paths: ['engine/Dockerfile', 'VERSION'] jobs: From 33f8ae2d79065038ebb1507a5871d24168a3d9ca Mon Sep 17 00:00:00 2001 From: Eric <132873174+eric-epsilla@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:34:12 +0800 Subject: [PATCH 3/6] Update Dockerfile.embed --- engine/Dockerfile.embed | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/engine/Dockerfile.embed b/engine/Dockerfile.embed index 5101ea5..3e19121 100644 --- a/engine/Dockerfile.embed +++ b/engine/Dockerfile.embed @@ -1,7 +1,7 @@ FROM epsilla/embedding:models AS models -FROM epsilla/base AS builder +FROM epsilla/ubuntu AS builder ADD ./ /vectordb WORKDIR /vectordb ENV OATPP_INSTALL_PATH=/vectordb/build/dependencies @@ -9,7 +9,7 @@ RUN scripts/install_oatpp_modules.sh RUN mkdir -p /vectordb/build && cd /vectordb/build && cmake .. && make && chmod +x vectordb -FROM epsilla/base +FROM epsilla/ubuntu WORKDIR /root ARG TARGETARCH ARG RELEASE_VERSION=latest @@ -22,10 +22,7 @@ COPY ./scripts/heartbeat.sh /heartbeat.sh COPY ./epsilla-embed /root/ COPY ./epsilla-embed/launch.conf /etc/supervisor/conf.d/launch.conf -RUN apt-get update && \ - apt-get install -y procps supervisor && \ - pip install --upgrade --no-cache-dir pip boto3 poetry --break-system-packages && \ - poetry update && \ +RUN poetry update && \ poetry install --only main && \ rm -rf /var/lib/apt/lists/* From 47c32d32eb322225f862c4a0179c17e2cd7a2b07 Mon Sep 17 00:00:00 2001 From: Eric <132873174+eric-epsilla@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:35:30 +0800 Subject: [PATCH 4/6] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9e29e10..ec96a62 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.15 +0.3.16 From a96257987e5f1bc29f9fa876763f8e0a20bf5144 Mon Sep 17 00:00:00 2001 From: Eric <132873174+eric-epsilla@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:53:52 +0800 Subject: [PATCH 5/6] Update Dockerfile.embed --- engine/Dockerfile.embed | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/Dockerfile.embed b/engine/Dockerfile.embed index 3e19121..593f1fd 100644 --- a/engine/Dockerfile.embed +++ b/engine/Dockerfile.embed @@ -1,7 +1,7 @@ -FROM epsilla/embedding:models AS models +FROM epsilla/embedding:models as models -FROM epsilla/ubuntu AS builder +FROM epsilla/ubuntu as builder ADD ./ /vectordb WORKDIR /vectordb ENV OATPP_INSTALL_PATH=/vectordb/build/dependencies From 63cce57e16e911b8db346e9f678101081796c06e Mon Sep 17 00:00:00 2001 From: Eric <132873174+eric-epsilla@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:56:52 +0800 Subject: [PATCH 6/6] Update Dockerfile --- engine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/Dockerfile b/engine/Dockerfile index 146ea77..0f441e7 100644 --- a/engine/Dockerfile +++ b/engine/Dockerfile @@ -1,4 +1,4 @@ -FROM epsilla/ubuntu as builder +FROM epsilla/base as builder ADD ./ /vectordb WORKDIR /vectordb ENV OATPP_INSTALL_PATH=/vectordb/build/dependencies