From a628783057f35e9824960ce582a698cfa55da057 Mon Sep 17 00:00:00 2001
From: Yuxing Deng <jxfa0043379@hotmail.com>
Date: Tue, 14 Nov 2023 14:33:15 +0800
Subject: [PATCH] build(bci): bump BCI to 15.5

And Upgrade golang to v1.20.10 and switch back to bci/golang image.
---
 Dockerfile        | 2 +-
 Dockerfile.dapper | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2afd8fe7..7248cb1e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.suse.com/bci/bci-base:15.3
+FROM registry.suse.com/bci/bci-base:15.5
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETOS
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 50798b35..e45c6281 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -1,13 +1,8 @@
-# FROM registry.suse.com/bci/golang:1.20
-FROM registry.suse.com/bci/bci-base:latest
+FROM registry.suse.com/bci/golang:1.20
+# confirm that suse bci golang version upgraded to 1.20.10 after 2023-11-14
 ARG PROXY
 ARG GOPROXY
 ARG ARCH=amd64
-ARG GO_VERSION=1.20.8
-RUN curl -sSL https://go.dev/dl/go${GO_VERSION}.linux-${ARCH}.tar.gz -o /tmp/go.tar.gz \
-    && rm -rf /usr/local/go && tar -C /usr/local -xzf /tmp/go.tar.gz \
-    && /usr/local/go/bin/go version
-ENV GOPATH=/go PATH=/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 RUN zypper -n install netcat wget curl gawk git make
 RUN zypper install -y -f docker
 ## install golangci-lint