Converge dockerfile for tests

Signed-off-by: Itxaka <itxaka@kairos.io>

Dockerfile

@@ -41,12 +41,4 @@ RUN dnf install -y binutils mtools efitools shim openssl dosfstools xorriso rsyn
 
 COPY --from=builder /enki /enki
 
-ENTRYPOINT ["/enki"]
-
-FROM gcr.io/kaniko-project/executor:latest
-
-COPY --from=builder /enki /enki
-
-ENTRYPOINT ["/enki"]
-
-CMD ["convert"]
+ENTRYPOINT ["/enki"]

Earthfile

@@ -4,14 +4,13 @@ VERSION 0.7
 ARG --global GO_VERSION=1.22-bookworm
 
 enki-image:
-    FROM DOCKERFILE -f e2e/assets/Dockerfile.enki e2e/assets/
+    FROM DOCKERFILE -f Dockerfile .
 
     SAVE IMAGE enki-image
 
 go-deps:
     ARG GO_VERSION
     FROM golang:$GO_VERSION
-    RUN apt-get update && apt-get install -y rsync gcc bash git jq docker
     WORKDIR /build
     COPY go.mod go.sum . # This will make the go mod download able to be cached as long as it hasnt change
     RUN go mod download

e2e/suite_test.go

@@ -27,17 +27,15 @@ func NewEnki(image string, dirs ...string) *Enki {
 	tmpDir, err := os.MkdirTemp("", "enki-e2e-tmp")
 	Expect(err).ToNot(HaveOccurred())
 	enkiBinary := path.Join(tmpDir, "enki")
-
 	compileEnki(enkiBinary)
-
 	return &Enki{ContainerImage: image, Path: enkiBinary, Dirs: dirs}
 }
 
 // enki relies on various external binaries. To make sure those dependencies
 // are in place (or to test the behavior of enki when they are not), we run enki
 // in a container using this function.
 func (e *Enki) Run(enkiArgs ...string) (string, error) {
-	return e.ContainerRun("/bin/enki", enkiArgs...)
+	return e.ContainerRun(e.Path, enkiArgs...)
 }
 
 // We need --privileged for `mount` to work in the container (used in the build_uki_test.go).