Drop separate grpcio installation from Dockerfile
crrev.com/c/5906161 introduced system-level
python3-grpc-tools, and manually installed ones
collide with it and are no longer needed
the Dolos requirements need to be installed though,
TODO to leverage venv better
BUG=b:395482678
TEST=run servod --sversion and /usr/local/bin/doloscmd
Change-Id: If594d291c96a30c9dcc9d898a08f306155629012
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/xolabs-common-core/+/6246923
Tested-by: Michal Matyjek <[email protected]>
Reviewed-by: Keith Haddow <[email protected]>
Commit-Queue: Keith Haddow <[email protected]>
Commit-Queue: Michal Matyjek <[email protected]>
Auto-Submit: Michal Matyjek <[email protected]>
diff --git a/src/dockerfiles/servod/Dockerfile b/src/dockerfiles/servod/Dockerfile
index fc6f9af..0cbe318 100644
--- a/src/dockerfiles/servod/Dockerfile
+++ b/src/dockerfiles/servod/Dockerfile
@@ -28,12 +28,14 @@
git \
python3-pip
-RUN pip3 install grpcio-tools grpcio-reflection grpcio --break-system-packages
-
WORKDIR /
RUN git clone https://chromium.googlesource.com/chromiumos/platform/dolos
+# TODO: leverage dolos venv better
+WORKDIR /dolos/tools
+RUN pip install --require-hashes -r requirements.txt -q
+
WORKDIR /dolos/tools/doloscmd
RUN python3 setup.py bdist_wheel
@@ -51,8 +53,6 @@
python3-pip \
uhubctl
-RUN pip3 install grpcio-reflection grpcio --break-system-packages
-
# As part of the migration from servod supplied to package supplied uhubctl
# remove any provided install and link the package install as the power code
# expects the binary to be in a specific location.
