From f363389d67624dea4f386e569ea866f00070f6fb Mon Sep 17 00:00:00 2001 From: Em Sharnoff Date: Mon, 2 Dec 2024 21:23:44 -0800 Subject: [PATCH 1/2] neonvm-daemon: Use go-chef in Dockerfile Probably an inadvertent merge conflict between #1090 and #989 meaning we accidentally weren't using go-chef for neonvm-daemon. Noticed this while developing locally and saw that it was re-downloading all of the dependencies for neonvm-daemon every time, even though I was making changes in the scheduler and the dependencies hadn't changed. --- neonvm-daemon/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neonvm-daemon/Dockerfile b/neonvm-daemon/Dockerfile index 4b9944e0e..fffe67b71 100644 --- a/neonvm-daemon/Dockerfile +++ b/neonvm-daemon/Dockerfile @@ -1,4 +1,5 @@ -FROM golang:1.23-alpine AS builder +ARG GO_BASE_IMG=autoscaling-go-base:dev +FROM $GO_BASE_IMG AS builder # Build the Go binary COPY . . From 2ce93bd02200318e3d928ec69540223456e1b493 Mon Sep 17 00:00:00 2001 From: Em Sharnoff Date: Wed, 4 Dec 2024 07:14:36 -0800 Subject: [PATCH 2/2] require go base image for daemon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cbbff7dd0..70dfc6b85 100644 --- a/Makefile +++ b/Makefile @@ -193,7 +193,7 @@ docker-build-runner: docker-build-go-base ## Build docker image for NeonVM runne . .PHONY: docker-build-daemon -docker-build-daemon: ## Build docker image for NeonVM daemon. +docker-build-daemon: docker-build-go-base ## Build docker image for NeonVM daemon. docker build \ --tag $(IMG_DAEMON) \ --file neonvm-daemon/Dockerfile \