From 1b3d88daac75d841fb8e0ee3a8ac588a8642f41e Mon Sep 17 00:00:00 2001
From: asemx <998264+asemx@users.noreply.github.com>
Date: Sat, 15 Oct 2022 20:04:28 +0000
Subject: [PATCH 1/4] make OS & go version as arguments

---
 Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4365af4e..da18a371 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,9 @@
 #
 # Uses a Go image to build a release binary.
 #
-FROM golang:1.18.1-buster as builder
+ARG golang=golang:1.18.1-buster
+#ARG golang=arm64v8/golang:1.19.2-bullseye
+FROM $golang as builder
 ARG tag=latest
 ARG INCLUDE_PLUGINS=true
 ENV DOCKER_TAG=$tag
@@ -18,7 +20,9 @@ RUN if [ "$INCLUDE_PLUGINS" = "true" ] ; then make build plugins ; else make bui
 #
 # Create final image
 #
-FROM debian:10.3
+ARG os=debian:10.3
+#ARG os=arm64v8/debian:bullseye
+FROM $os
 WORKDIR /
 
 RUN apt-get update && \

From 273d5c937b7cb216adafe53e838ec841d342cf43 Mon Sep 17 00:00:00 2001
From: asemx <998264+asemx@users.noreply.github.com>
Date: Sat, 15 Oct 2022 17:02:08 -0700
Subject: [PATCH 2/4] fix ARG in dockerfile

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index da18a371..49a44331 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,10 @@
 #
 # Uses a Go image to build a release binary.
 #
-ARG golang=golang:1.18.1-buster
+ARG golang=golang:1.19.2-bullseye
+ARG osver=debian:bullseye
 #ARG golang=arm64v8/golang:1.19.2-bullseye
+#ARG os=arm64v8/debian:bullseye
 FROM $golang as builder
 ARG tag=latest
 ARG INCLUDE_PLUGINS=true
@@ -20,9 +22,7 @@ RUN if [ "$INCLUDE_PLUGINS" = "true" ] ; then make build plugins ; else make bui
 #
 # Create final image
 #
-ARG os=debian:10.3
-#ARG os=arm64v8/debian:bullseye
-FROM $os
+FROM $osver
 WORKDIR /
 
 RUN apt-get update && \

From 9a6ba7786b6df9a4172da5bf139c3201e3e47c5a Mon Sep 17 00:00:00 2001
From: asemx <998264+asemx@users.noreply.github.com>
Date: Sat, 14 Jan 2023 22:48:01 -0800
Subject: [PATCH 3/4] cleanup

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 49a44331..cb569e08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,6 @@
 #
 ARG golang=golang:1.19.2-bullseye
 ARG osver=debian:bullseye
-#ARG golang=arm64v8/golang:1.19.2-bullseye
-#ARG os=arm64v8/debian:bullseye
 FROM $golang as builder
 ARG tag=latest
 ARG INCLUDE_PLUGINS=true

From da072303add743e9e74781f5d98aa3239fd32160 Mon Sep 17 00:00:00 2001
From: asemx <998264+asemx@users.noreply.github.com>
Date: Mon, 16 Jan 2023 12:35:04 -0800
Subject: [PATCH 4/4] use existing docker versions

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb569e08..fc1eb3dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@
 #
 # Uses a Go image to build a release binary.
 #
-ARG golang=golang:1.19.2-bullseye
-ARG osver=debian:bullseye
+ARG golang=golang:1.18.1-buster
+ARG osver=debian:10.3
 FROM $golang as builder
 ARG tag=latest
 ARG INCLUDE_PLUGINS=true