Merge branch 'main' into misha/vxlan-controller-multiarch-support

neondatabase · Dec 6, 2024 · 77b50bf · 77b50bf
2 parents db25758 + 6afa19f
commit 77b50bf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-template.md b/.github/ISSUE_TEMPLATE/bug-template.md
@@ -3,6 +3,7 @@ name: Bug template
 about: Template that will help you to submit a visible and actionable bug report.
 title: 'Bug: '
 labels: t/bug
+type: Bug
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/epic-template.md b/.github/ISSUE_TEMPLATE/epic-template.md
@@ -4,6 +4,7 @@ about: A set of related tasks contributing towards specific outcome, comprising
   more than 1 week of work.
 title: 'Epic: '
 labels: t/Epic
+type: Epic
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/improvement-template.md b/.github/ISSUE_TEMPLATE/improvement-template.md
@@ -3,6 +3,7 @@ name: Improvement template
 about: Template that will help you to submit the idea for an improvement to the code base.
 title: ''
 labels: t/improvement
+type: Improvement
 assignees: ''
 
 ---

diff --git 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 \

diff --git 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 . .