style: adaptive Go image version

Author: zhufuyi

cmd/sponge/commands/generate/common.go

@@ -27,7 +27,8 @@ import (
 )
 
 const (
-	defaultGoModVersion = "go 1.23.0"
+	defaultGoModVersion      = "go 1.23.0"
+	defaultImageGoModVersion = "golang:1.23-alpine"
 
 	// TplNameSponge name of the template
 	TplNameSponge = "sponge"
@@ -853,6 +854,16 @@ func getLocalGoVersion() string {
 	return versionList[0].goVersion
 }
 
+func extractImageGoVersion() string {
+	goVersion := getLocalGoVersion()
+	re := regexp.MustCompile(`go\s+(\d+\.\d+)\.\d+`)
+	matches := re.FindStringSubmatch(goVersion)
+	if len(matches) > 1 {
+		return fmt.Sprintf("golang:%s-alpine", matches[1])
+	}
+	return defaultImageGoModVersion
+}
+
 func dbDriverErr(driver string) error {
 	return errors.New("unsupported db driver: " + driver)
 }
@@ -892,6 +903,10 @@ func GetGoModFields(moduleName string) []replacer.Field {
 			Old: defaultGoModVersion,
 			New: getLocalGoVersion(),
 		},
+		{
+			Old: defaultImageGoModVersion,
+			New: extractImageGoVersion(),
+		},
 		{
 			Old: spongeTemplateVersionMark,
 			New: getLocalSpongeTemplateVersion(),

cmd/sponge/commands/generate/grpc-http-pb.go

@@ -302,6 +302,10 @@ func (g *httpAndGRPCPbGenerator) addFields(r replacer.Replacer) []replacer.Field
 			Old: defaultGoModVersion,
 			New: getLocalGoVersion(),
 		},
+		{
+			Old: defaultImageGoModVersion,
+			New: extractImageGoVersion(),
+		},
 		{
 			Old: "serverNameExample",
 			New: g.serverName,

cmd/sponge/commands/generate/http-pb.go

@@ -276,6 +276,10 @@ func (g *httpPbGenerator) addFields(r replacer.Replacer) []replacer.Field {
 			Old: defaultGoModVersion,
 			New: getLocalGoVersion(),
 		},
+		{
+			Old: defaultImageGoModVersion,
+			New: extractImageGoVersion(),
+		},
 		{
 			Old: "serverNameExample",
 			New: g.serverName,

cmd/sponge/commands/generate/http.go

@@ -449,6 +449,10 @@ func (g *httpGenerator) addFields(r replacer.Replacer) []replacer.Field {
 			Old: defaultGoModVersion,
 			New: getLocalGoVersion(),
 		},
+		{
+			Old: defaultImageGoModVersion,
+			New: extractImageGoVersion(),
+		},
 		{
 			Old: "userExampleNO       = 1",
 			New: fmt.Sprintf("userExampleNO = %d", rand.Intn(99)+1),

cmd/sponge/commands/generate/rpc-gw-pb.go

@@ -276,6 +276,10 @@ func (g *rpcGwPbGenerator) addFields(r replacer.Replacer) []replacer.Field {
 			Old: defaultGoModVersion,
 			New: getLocalGoVersion(),
 		},
+		{
+			Old: defaultImageGoModVersion,
+			New: extractImageGoVersion(),
+		},
 		{
 			Old:             "serverNameExample",
 			New:             g.serverName,

cmd/sponge/commands/generate/rpc-pb.go

@@ -270,6 +270,10 @@ func (g *rpcPbGenerator) addFields(r replacer.Replacer) []replacer.Field {
 			Old: defaultGoModVersion,
 			New: getLocalGoVersion(),
 		},
+		{
+			Old: defaultImageGoModVersion,
+			New: extractImageGoVersion(),
+		},
 		{
 			Old: "serverNameExample",
 			New: g.serverName,

cmd/sponge/commands/generate/rpc.go

@@ -468,6 +468,10 @@ func (g *rpcGenerator) addFields(r replacer.Replacer) []replacer.Field {
 			Old: defaultGoModVersion,
 			New: getLocalGoVersion(),
 		},
+		{
+			Old: defaultImageGoModVersion,
+			New: extractImageGoVersion(),
+		},
 		{
 			Old: "_userExampleNO       = 2",
 			New: fmt.Sprintf("_userExampleNO       = %d", rand.Intn(99)+1),

cmd/sponge/commands/generate/template.go

@@ -31,12 +31,6 @@ EXPOSE 8282 8283`
 FROM alpine:latest
 MAINTAINER zhufuyi "g.zhufuyi@gmail.com"
 
-# set the time zone to Shanghai
-RUN apk add tzdata  \
-    && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && echo "Asia/Shanghai" > /etc/timezone \
-    && apk del tzdata
-
 # add curl, used for http service checking, can be installed without it if deployed in k8s
 RUN apk add curl
 
@@ -62,12 +56,6 @@ RUN cd $GOPATH/pkg/mod/github.com/grpc-ecosystem/grpc-health-probe@v0.4.12 \
 FROM alpine:latest
 MAINTAINER zhufuyi "g.zhufuyi@gmail.com"
 
-# set the time zone to Shanghai
-RUN apk add tzdata  \
-    && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && echo "Asia/Shanghai" > /etc/timezone \
-    && apk del tzdata
-
 # add grpc_health_probe for health check of grpc services
 COPY --from=build /grpc_health_probe /bin/grpc_health_probe
 COPY --from=build /serverNameExample /app/serverNameExample

cmd/sponge/scripts/Dockerfile

@@ -3,12 +3,6 @@ MAINTAINER zhufuyi "g.zhufuyi@gmail.com"
 
 USER root
 
-# set the time zone to Shanghai
-#RUN apk add tzdata  \
-#    && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-#    && echo "Asia/Shanghai" > /etc/timezone \
-#    && apk del tzdata
-
 COPY .sponge /root/.sponge
 COPY sponge /usr/local/bin/sponge
 RUN chmod +x /usr/local/bin/sponge

cmd/sponge/scripts/build-sponge-image.sh

@@ -52,5 +52,5 @@ rm -rf .sponge
 # delete none image
 noneImages=$(docker images | grep "<none>" | awk '{print $3}')
 if [ "X${noneImages}" != "X" ]; then
-  docker rmi ${noneImages} > /dev/null
+  docker rmi ${noneImages} > /dev/null 2>&1 || true
 fi