From 4e0a0330edd6650a916dc145221df52933392948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A7=E9=A9=8A?= <igs170911@gmail.com>
Date: Wed, 12 Mar 2025 14:08:38 +0800
Subject: [PATCH] fix: docker file

---
 Makefile                                  |  9 ++-------
 build/Dockerfile                          | 15 +++++++++------
 internal/server/account/account_server.go |  4 ++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index daf4338..b615f50 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ GOFMT ?= gofmt "-s"
 GOFILES := $(shell find . -name "*.go")
 LDFLAGS := -s -w
 VERSION="v1.0.4"
-DOCKER_REPO="igs170911/member"
+DOCKER_REPO="container.wang/app-cloudep-member-service"
 GIT_COMMIT ?= $(shell git rev-parse --short HEAD)
 
 .PHONY: test
@@ -31,12 +31,7 @@ run-docker: # 建立 rpc code
 .PHONY: build-docker
 build-docker:
 	cp ./build/Dockerfile Dockerfile
-	docker buildx build \
-		-t $(DOCKER_REPO):$(VERSION) \
-		--build-arg VERSION=$(VERSION) \
-		--build-arg GIT_COMMIT=$(GIT_COMMIT) \
-		--secret id=ssh_key,src=./build/id_ed25519 \
-		--progress=plain .
+	docker buildx build -t $(DOCKER_REPO):$(VERSION) --build-arg SSH_PRIVATE_KEY="$(cat ~/.ssh/id_ed25519)" .
 	rm -rf Dockerfile
 	@echo "Generate core-api files successfully"
 
diff --git a/build/Dockerfile b/build/Dockerfile
index d720d4e..0f603a0 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,12 +1,12 @@
 ###########
 # BUILDER #
 ###########
-
-FROM golang:1.23.4 AS builder
+FROM golang:1.24.0 as builder
 
 ARG VERSION
 ARG BUILT
 ARG GIT_COMMIT
+ARG SSH_PRV_KEY
 
 # private go packages
 ENV GOPRIVATE=code.30cm.net
@@ -16,12 +16,15 @@ COPY . .
 
 
 RUN apt-get update && \
-    apt-get install -y git && \
-    mkdir /root/.ssh
+    apt-get install git
 
 # Make the root foler for our ssh
-RUN --mount=type=secret,id=ssh_key,dst=/root/.ssh/id_rsa \
-    ssh-keyscan git.30cm.net >> /root/.ssh/known_hosts
+RUN mkdir -p /root/.ssh && \
+    chmod 0700 /root/.ssh && \
+    ssh-keyscan git.30cm.net > /root/.ssh/known_hosts && \
+    echo "$SSH_PRV_KEY" > /root/.ssh/id_rsa && \
+    chmod 600 /root/.ssh/id_rsa
+
 
 
 RUN --mount=type=ssh go mod download
diff --git a/internal/server/account/account_server.go b/internal/server/account/account_server.go
index 8dbeff7..cfdc1bd 100644
--- a/internal/server/account/account_server.go
+++ b/internal/server/account/account_server.go
@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.7.3
+// goctl 1.8.1
 // Source: member.proto
 
 package server
@@ -8,7 +8,7 @@ import (
 	"context"
 
 	"code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
-	accountlogic "code.30cm.net/digimon/app-cloudep-member-server/internal/logic/account"
+	"code.30cm.net/digimon/app-cloudep-member-server/internal/logic/account"
 	"code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
 )