From 1e3c8a809c3840a007667b1bc95b428765977983 Mon Sep 17 00:00:00 2001
From: Misha Sakhnov <misha@neon.tech>
Date: Wed, 9 Oct 2024 13:23:27 +0300
Subject: [PATCH] neonvmd: moved neonvm/daemon -> neonvm-daemon to comply with
 new repo flatten structure

Signed-off-by: Misha Sakhnov <misha@neon.tech>
---
 .github/workflows/build-test-vm.yaml        |  4 ++--
 Makefile                                    |  4 ++--
 {neonvm/daemon => neonvm-daemon}/Dockerfile |  2 +-
 {neonvm/daemon => neonvm-daemon}/main.go    |  0
 vm-builder/files/Dockerfile.img             | 10 +++-------
 5 files changed, 8 insertions(+), 12 deletions(-)
 rename {neonvm/daemon => neonvm-daemon}/Dockerfile (66%)
 rename {neonvm/daemon => neonvm-daemon}/main.go (100%)

diff --git a/.github/workflows/build-test-vm.yaml b/.github/workflows/build-test-vm.yaml
index c3679e75d..2c7f991be 100644
--- a/.github/workflows/build-test-vm.yaml
+++ b/.github/workflows/build-test-vm.yaml
@@ -29,7 +29,7 @@ on:
 
 env:
   IMG_POSTGRES_16_BULLSEYE: "neondatabase/vm-postgres-16-bullseye"
-  # using locally build base image
+  # using image built in the same workflow
   IMG_DAEMON: "daemon:dev"
 
 defaults:
@@ -62,7 +62,7 @@ jobs:
           cache: false
         # Sometimes setup-go gets stuck. Without this, it'll keep going until the job gets killed
         timeout-minutes: 10
- 
+      - run: make docker-build-daemon
       - run: make bin/vm-builder
 
       - name: upload vm-builder
diff --git a/Makefile b/Makefile
index f0e75a5f8..0612541fc 100644
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,7 @@ build: fmt vet bin/vm-builder ## Build all neonvm binaries.
 	GOOS=linux go build -o bin/runner           neonvm/runner/*.go
 
 .PHONY: bin/vm-builder
-bin/vm-builder: docker-build-daemon ## Build vm-builder binary.
+bin/vm-builder: ## Build vm-builder binary.
 	GOOS=linux CGO_ENABLED=0 go build -o bin/vm-builder -ldflags "-X main.Version=${GIT_INFO} -X main.NeonvmDaemonImage=${IMG_DAEMON}" vm-builder/main.go 
 .PHONY: run
 run: fmt vet ## Run a controller from your host.
@@ -191,7 +191,7 @@ docker-build-runner: docker-build-go-base ## Build docker image for NeonVM runne
 docker-build-daemon: ## Build docker image for NeonVM daemon.
 	docker build \
 		--tag $(IMG_DAEMON) \
-		--file neonvm/daemon/Dockerfile \
+		--file neonvm-daemon/Dockerfile \
 		.
 
 .PHONY: docker-build-vxlan-controller
diff --git a/neonvm/daemon/Dockerfile b/neonvm-daemon/Dockerfile
similarity index 66%
rename from neonvm/daemon/Dockerfile
rename to neonvm-daemon/Dockerfile
index 46352291b..304065951 100644
--- a/neonvm/daemon/Dockerfile
+++ b/neonvm-daemon/Dockerfile
@@ -4,7 +4,7 @@ FROM golang:1.23-alpine AS builder
 COPY . .
 
 # Build
-RUN CGO_ENABLED=0 go build -a -o /neonvmd neonvm/daemon/main.go
+RUN CGO_ENABLED=0 go build -o /neonvmd neonvm-daemon/main.go
 
 FROM scratch
 COPY --from=builder /neonvmd /neonvmd
diff --git a/neonvm/daemon/main.go b/neonvm-daemon/main.go
similarity index 100%
rename from neonvm/daemon/main.go
rename to neonvm-daemon/main.go
diff --git a/vm-builder/files/Dockerfile.img b/vm-builder/files/Dockerfile.img
index 1f365ee15..b72027975 100644
--- a/vm-builder/files/Dockerfile.img
+++ b/vm-builder/files/Dockerfile.img
@@ -7,7 +7,7 @@ FROM {{.RootDiskImage}} AS rootdisk
 USER root
 {{.SpecMerge}}
 
-FROM {{.NeonvmDaemonImage}} AS vm-daemon-loader
+FROM {{.NeonvmDaemonImage}} AS neonvm-daemon-loader
 
 FROM alpine:3.19 AS vm-runtime
 # add busybox
@@ -21,9 +21,6 @@ RUN set -e \
 COPY helper.move-bins.sh /helper.move-bins.sh
 
 # add udevd and agetty (with shared libs)
-#
-# We need unshare and nsenter from util-linux-misc because buxybox's implementations don't have
-# support for cgroup namespaces (at least, master as of 2024-08-11).
 RUN set -e \
 	&& apk add --no-cache --no-progress --quiet \
 		acpid \
@@ -42,7 +39,6 @@ RUN set -e \
 		udevadm \
 		agetty \
 		su-exec \
-        unshare nsenter \
         cgexec \
 		resize2fs \
 		blkid \
@@ -74,7 +70,7 @@ RUN set -e \
 		quota-tools \
 	&& /helper.move-bins.sh quota edquota quotacheck quotaoff quotaon quotastats setquota repquota tune2fs
 
-COPY --from=vm-daemon-loader /neonvmd /neonvm/bin/neonvmd
+COPY --from=neonvm-daemon-loader /neonvmd /neonvm/bin/neonvmd
 
 # init scripts & configs
 COPY inittab     /neonvm/bin/inittab
@@ -108,7 +104,7 @@ RUN set -e \
     && /neonvm/bin/id -g sshd > /dev/null 2>&1 || /neonvm/bin/addgroup sshd \
     && /neonvm/bin/id -u sshd > /dev/null 2>&1 || /neonvm/bin/adduser -D -H -G sshd -g 'sshd privsep' -s /neonvm/bin/nologin sshd
 
-FROM vm-runtime AS builder
+FROM alpine:3.19 AS builder
 ARG DISK_SIZE
 COPY --from=rootdisk-mod / /rootdisk