Merge branch 'dev' into paramm/project_serde

OpenMined · Jul 19, 2023 · 37b88b2 · 37b88b2
2 parents 5a5b837 + f3dd1d2
commit 37b88b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/packages/grid/backend/backend.dockerfile b/packages/grid/backend/backend.dockerfile
@@ -56,8 +56,9 @@ RUN --mount=type=cache,target=/root/.cache \
     pip uninstall ansible ansible-core -y && \
     rm -rf ~/.local/lib/python3.11/site-packages/ansible_collections
 
-# clean up
-RUN apt purge --auto-remove linux-libc-dev -y
+# security patches
+RUN apt purge --auto-remove linux-libc-dev -y || true
+RUN apt purge --auto-remove libldap-2.5-0 -y || true
 
 # copy any changed source
 COPY syft/src /app/syft/src

diff --git a/packages/grid/vpn/headscale.dockerfile b/packages/grid/vpn/headscale.dockerfile
@@ -44,7 +44,8 @@ RUN mkdir -p /headscale/data
 
 ENV NETWORK_NAME="omnet"
 
-# clean up
-RUN apt purge --auto-remove linux-libc-dev -y
+# security patches
+RUN apt purge --auto-remove linux-libc-dev -y || true
+RUN apt purge --auto-remove libldap-2.5-0 -y || true
 
 CMD ["sh", "-c", "/headscale/headscale.sh ${NETWORK_NAME}"]
diff --git a/packages/grid/worker/worker.dockerfile b/packages/grid/worker/worker.dockerfile
@@ -58,8 +58,9 @@ RUN --mount=type=cache,target=/root/.cache \
     pip uninstall ansible ansible-core -y && \
     rm -rf ~/.local/lib/python3.11/site-packages/ansible_collections
 
-# clean up
-RUN apt purge --auto-remove linux-libc-dev -y
+# security patches
+RUN apt purge --auto-remove linux-libc-dev -y || true
+RUN apt purge --auto-remove libldap-2.5-0 -y || true
 
 # copy any changed source
 COPY syft/src /app/syft/src