us pip sync

sanderegg · sanderegg · commit c6da1b1216c3 · 2024-10-22T14:29:27.000+02:00
diff --git a/services/agent/Dockerfile b/services/agent/Dockerfile
@@ -112,8 +112,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/agent,target=/build/services/agent,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/api-server/Dockerfile b/services/api-server/Dockerfile
@@ -108,8 +108,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/api-server,target=/build/services/api-server,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/catalog/Dockerfile b/services/catalog/Dockerfile
@@ -109,8 +109,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/catalog,target=/build/services/catalog,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/clusters-keeper/Dockerfile b/services/clusters-keeper/Dockerfile
@@ -128,8 +128,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/clusters-keeper,target=/build/services/clusters-keeper,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/dask-sidecar/Dockerfile b/services/dask-sidecar/Dockerfile
@@ -116,8 +116,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/dask-sidecar,target=/build/services/dask-sidecar,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 # --------------------------Production stage -------------------
diff --git a/services/datcore-adapter/Dockerfile b/services/datcore-adapter/Dockerfile
@@ -109,8 +109,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/datcore-adapter,target=/build/services/datcore-adapter,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/director-v2/Dockerfile b/services/director-v2/Dockerfile
@@ -109,8 +109,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/director-v2,target=/build/services/director-v2,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/dynamic-scheduler/Dockerfile b/services/dynamic-scheduler/Dockerfile
@@ -109,8 +109,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/dynamic-scheduler,target=/build/services/dynamic-scheduler,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/dynamic-sidecar/Dockerfile b/services/dynamic-sidecar/Dockerfile
@@ -131,13 +131,6 @@ RUN --mount=type=cache,target=/root/.cache/uv \
 
 WORKDIR /build
 
-# install base 3rd party dependencies
-# NOTE: copies to /build to avoid overwriting later which would invalidate this layer
-RUN \
-  --mount=type=bind,source=services/dynamic-sidecar/requirements/_base.txt,target=_base.txt \
-  --mount=type=cache,mode=0755,target=/root/.cache/pip \
-  uv pip install \
-  --requirement _base.txt
 
 # copy utility devops scripts
 COPY --chown=scu:scu services/dynamic-sidecar/scripts/Makefile /home/scu
@@ -159,8 +152,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/dynamic-sidecar,target=/build/services/dynamic-sidecar,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 # --------------------------Production stage -------------------
diff --git a/services/efs-guardian/Dockerfile b/services/efs-guardian/Dockerfile
@@ -146,8 +146,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/efs-guardian,target=/build/services/efs-guardian,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/invitations/Dockerfile b/services/invitations/Dockerfile
@@ -109,8 +109,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/invitations,target=/build/services/invitations,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/payments/Dockerfile b/services/payments/Dockerfile
@@ -109,8 +109,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/payments,target=/build/services/payments,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/resource-usage-tracker/Dockerfile b/services/resource-usage-tracker/Dockerfile
@@ -109,8 +109,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/resource-usage-tracker,target=/build/services/resource-usage-tracker,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 
diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile
@@ -121,8 +121,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/storage,target=/build/services/storage,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 # -------------------------- -------------------------------
 
diff --git a/services/web/Dockerfile b/services/web/Dockerfile
@@ -120,8 +120,8 @@ RUN \
   --mount=type=bind,source=packages,target=/build/packages,rw \
   --mount=type=bind,source=services/web/server,target=/build/services/web/server,rw \
   --mount=type=cache,target=/root/.cache/uv \
-  uv pip install \
-  --requirement requirements/prod.txt \
+  uv pip sync \
+  requirements/prod.txt \
   && uv pip list
 
 # --------------------------Production stage -------------------
