Fix Docker by using protoc with include/. Add protoc to GH actions

chroma-core · Jan 15, 2024 · 1823c17 · 1823c17
1 parent 7f2065a
commit 1823c17
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/chroma-worker-test.yml b/.github/workflows/chroma-worker-test.yml
@@ -19,6 +19,8 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v2
     - name: Build
       run: cargo build --verbose
     - name: Test

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust/worker/Cargo.toml b/rust/worker/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 [dependencies]
 tonic = "0.10"
 prost = "0.12"
+prost-types = "0.12"
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
 tokio-util = "0.7.10"
 rand = "0.8.5"

diff --git a/rust/worker/Dockerfile b/rust/worker/Dockerfile
@@ -1,8 +1,14 @@
 FROM rust:1.74.1 as builder
 
-WORKDIR /chroma
+WORKDIR /chroma/
 COPY . .
 
+ENV PROTOC_ZIP=protoc-25.1-linux-x86_64.zip
+RUN curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v25.1/$PROTOC_ZIP \
+    && unzip -o $PROTOC_ZIP -d /usr/local bin/protoc \
+    && unzip -o $PROTOC_ZIP -d /usr/local 'include/*' \
+    && rm -f $PROTOC_ZIP
+
 RUN cargo build
 
 # For now this runs cargo test since we have no main binary