From acbea2c595fc09c7a23b053e8d5fe6b08d0e00e6 Mon Sep 17 00:00:00 2001
From: Dimitris Karakasilis <dimitris@karakasilis.me>
Date: Thu, 5 Oct 2023 15:37:31 +0300
Subject: [PATCH] Revert accidental changes to Dockerfile

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
---
 Dockerfile | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b6ce7f0..fc535e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,26 @@
+ARG GO_VERSION=1.20-alpine3.18
+FROM golang:$GO_VERSION AS builder
 
-FROM busybox as base
-FROM busybox as builder
+WORKDIR /build
+COPY . .
 
-COPY --from=base . /rootfs
+ENV CGO_ENABLED=0
+RUN go mod download
+# Set arg/env after go mod download, otherwise we invalidate the cached layers due to the commit changing easily
+ARG ENKI_VERSION
+ARG ENKI_COMMIT
+ENV ENKI_VERSION=${ENKI_VERSION}
+ENV ENKI_COMMIT=${ENKI_COMMIT}
+RUN go build \
+    -ldflags "-w -s \
+    -X github.com/kairos-io/enki/internal/version.version=$ENKI_VERSION \
+    -X github.com/kairos-io/enki/internal/version.gitCommit=$ENKI_COMMIT" \
+    -o /enki
 
-RUN echo "nameserver 8.8.8.8" > /rootfs/etc/resolv.conf
-RUN cat /rootfs/etc/resolv.conf
+FROM gcr.io/kaniko-project/executor:latest
 
-COPY --from=quay.io/luet/base:latest /usr/bin/luet /usr/bin/luet
+COPY --from=builder /enki /enki
 
-COPY --from=quay.io/kairos/framework:master_ubuntu . /rootfs
-
-# Avoid to accidentally push keys generated by package managers
-RUN rm -rf /rootfs/etc/ssh/ssh_host_*
-
-FROM scratch as rootfs
-
-COPY --from=builder /rootfs/ .
-
-FROM rootfs
-# Additional os specific things
+ENTRYPOINT ["/enki"]
 
+CMD ["convert"]