Skip to content

Commit

Permalink
chore: switch trident base images to debian
Browse files Browse the repository at this point in the history
needed as the `mount.nfs` binary found inside the talos
partition requires debian libraries.

Signed-off-by: Clément Nussbaumer <[email protected]>
  • Loading branch information
clementnuss committed Oct 25, 2024
1 parent cf89192 commit 9ab0d23
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions trident-distrowith/dockerfile.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
--- Dockerfile.original 2024-10-24 19:51:25
+++ Dockerfile 2024-10-24 19:51:05
@@ -1,24 +1,13 @@
--- Dockerfile.original 2024-10-24 20:03:40
+++ Dockerfile 2024-10-24 20:03:12
@@ -1,24 +1,15 @@
ARG ARCH=amd64

-FROM --platform=linux/${ARCH} alpine:latest as baseimage
+FROM --platform=linux/${ARCH} alpine:3.20

RUN apk add nfs-utils
+FROM --platform=linux/${ARCH} debian:12-slim
+RUN apt update && \
+ apt install -y \
+ nfs-common && \
+ rm -rf /var/lib/apt/lists/*

-RUN apk add nfs-utils
-
-#Get the mount.nfs4 dependency
-RUN ldd /sbin/mount.nfs4 | tr -s '[:space:]' '\n' | grep '^/' | xargs -I % sh -c 'mkdir -p /nfs-deps/$(dirname %) && cp -L % /nfs-deps/%'
-RUN ldd /sbin/mount.nfs | tr -s '[:space:]' '\n' | grep '^/' | xargs -I % sh -c 'mkdir -p /nfs-deps/$(dirname %) && cp -r -u -L % /nfs-deps/%'
Expand All @@ -25,4 +29,4 @@
-
ARG BIN=trident_orchestrator
ARG CLI_BIN=tridentctl
ARG CHWRAP_BIN=chwrap.tar
ARG CHWRAP_BIN=chwrap.tar

0 comments on commit 9ab0d23

Please sign in to comment.