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: diff --git a/VERSION b/VERSION index 9e29e10..ec96a62 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.15 +0.3.16 diff --git a/engine/Dockerfile b/engine/Dockerfile index a2e29f2..0f441e7 100644 --- a/engine/Dockerfile +++ b/engine/Dockerfile @@ -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 diff --git a/engine/Dockerfile.embed b/engine/Dockerfile.embed index 5101ea5..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/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/*