From 05a47052a29eca1093f1bc77ba5293b4661359b4 Mon Sep 17 00:00:00 2001
From: ahg-g <ahg@google.com>
Date: Fri, 21 Feb 2025 03:07:31 +0000
Subject: [PATCH] Use gcr.io/distroless/static:nonroot base image

---
 Dockerfile | 4 ++--
 Makefile   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4adc82e4..312700bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Dockerfile has specific requirement to put this ARG at the beginning:
 # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
-ARG BUILDER_IMAGE=golang:1.23-alpine
-ARG BASE_IMAGE=gcr.io/distroless/base-debian10
+ARG BUILDER_IMAGE=golang:1.23
+ARG BASE_IMAGE=gcr.io/distroless/static:nonroot
 
 ## Multistage build
 FROM ${BUILDER_IMAGE} AS builder
diff --git a/Makefile b/Makefile
index 1d8fc531..8d02a5e8 100644
--- a/Makefile
+++ b/Makefile
@@ -36,8 +36,8 @@ SYNCER_IMAGE_NAME := lora-syncer
 SYNCER_IMAGE_REPO ?= $(IMAGE_REGISTRY)/$(SYNCER_IMAGE_NAME)
 SYNCER_IMAGE_TAG ?= $(SYNCER_IMAGE_REPO):$(GIT_TAG)
 
-BASE_IMAGE ?= gcr.io/distroless/base-debian10
-BUILDER_IMAGE ?= golang:1.23-alpine
+BASE_IMAGE ?= gcr.io/distroless/static:nonroot
+BUILDER_IMAGE ?= golang:1.23
 ifdef GO_VERSION
 BUILDER_IMAGE = golang:$(GO_VERSION)
 endif