From ba74445c54cc106f856cc993078aaafe6234b1e0 Mon Sep 17 00:00:00 2001
From: Markus Pesch <markus.pesch@cryptic.systems>
Date: Mon, 8 Apr 2024 16:22:22 +0200
Subject: [PATCH] fix: define images in Dockerfile

---
 Dockerfile |  9 ++-------
 Makefile   | 14 --------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7fac4fa..67f2f61 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,4 @@
-ARG BASE_IMAGE
-ARG BUILD_IMAGE
-
-# BUILD
-# =====================================================================
-FROM ${BUILD_IMAGE} AS build
+FROM docker.io/library/golang:1.21.6-alpine3.18
 
 ARG VERSION
 
@@ -15,7 +10,7 @@ RUN cd /workspace && \
 
 # TARGET
 # =====================================================================
-FROM ${BASE_IMAGE}
+FROM docker.io/library/alpine:3.19
 
 COPY --from=build /workspace/getidev /usr/bin/getidev
 
diff --git a/Makefile b/Makefile
index a421191..7879390 100644
--- a/Makefile
+++ b/Makefile
@@ -4,18 +4,6 @@ VERSION?=$(shell git describe --abbrev=0)+hash.$(shell git rev-parse --short HEA
 # CONTAINER_RUNTIME
 CONTAINER_RUNTIME?=$(shell which podman)
 
-# BUILD_IMAGE
-BUILD_IMAGE_REGISTRY_HOST?=docker.io
-BUILD_IMAGE_REPOSITORY=library/golang
-BUILD_IMAGE_VERSION?=1.16
-BUILD_IMAGE_FULLY_QUALIFIED:=${BUILD_IMAGE_REGISTRY_HOST}/${BUILD_IMAGE_REPOSITORY}:${BUILD_IMAGE_VERSION}
-
-# BASE_IMAGE
-BASE_IMAGE_REGISTRY_HOST?=docker.io
-BASE_IMAGE_REPOSITORY=library/busybox
-BASE_IMAGE_VERSION?=latest
-BASE_IMAGE_FULLY_QUALIFIED=${BASE_IMAGE_REGISTRY_HOST}/${BASE_IMAGE_REPOSITORY}:${BASE_IMAGE_VERSION}
-
 # CONTAINER_IMAGE
 CONTAINER_IMAGE_REGISTRY_HOST?=docker.io
 CONTAINER_IMAGE_REPOSITORY=volkerraschek/getidev
@@ -55,8 +43,6 @@ gosec:
 PHONY+=container-image/build
 container-image/build:
 	${CONTAINER_RUNTIME} build \
-		--build-arg BASE_IMAGE=${BASE_IMAGE_FULLY_QUALIFIED} \
-		--build-arg BUILD_IMAGE=${BUILD_IMAGE_FULLY_QUALIFIED} \
 		--build-arg VERSION=${VERSION} \
 		--file ./Dockerfile \
 		--no-cache \