From 74d095bcbc72a74b87ce1c7916988b585bcc83bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A7=E9=A9=8A?=
 <daniel@TW-4120-NB.supermicro.com>
Date: Wed, 12 Mar 2025 15:30:43 +0800
Subject: [PATCH] fix: docker file

---
 Makefile                                      |  2 +-
 build/Dockerfile                              | 14 +++++++-----
 .../permission_service_server.go              | 22 +++++++++++++++++++
 .../tokenservice/token_service_server.go      |  2 +-
 pkg/usecase/additional.go                     |  4 ++++
 5 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 internal/server/permissionservice/permission_service_server.go

diff --git a/Makefile b/Makefile
index 9bba1ad..70dc49b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ GOFMT ?= gofmt "-s"
 GOFILES := $(shell find . -name "*.go")
 LDFLAGS := -s -w
 VERSION="v1.0.1"
-DOCKER_REPO="reg.wang/app-cloudep-permission-service"
+DOCKER_REPO="container.wang/app-cloudep-permission-service"
 
 .PHONY: test
 test: # 進行測試
diff --git a/build/Dockerfile b/build/Dockerfile
index 99fbad8..72350d3 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -2,11 +2,12 @@
 # BUILDER #
 ###########
 
-FROM golang:1.24.0 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 +17,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/permissionservice/permission_service_server.go b/internal/server/permissionservice/permission_service_server.go
new file mode 100644
index 0000000..accfb3f
--- /dev/null
+++ b/internal/server/permissionservice/permission_service_server.go
@@ -0,0 +1,22 @@
+// Code generated by goctl. DO NOT EDIT.
+// goctl 1.8.1
+// Source: permission.proto
+
+package server
+
+import (
+	"code.30cm.net/digimon/app-cloudep-permission-server/gen_result/pb/permission"
+	"code.30cm.net/digimon/app-cloudep-permission-server/internal/logic/permissionservice"
+	"code.30cm.net/digimon/app-cloudep-permission-server/internal/svc"
+)
+
+type PermissionServiceServer struct {
+	svcCtx *svc.ServiceContext
+	permission.UnimplementedPermissionServiceServer
+}
+
+func NewPermissionServiceServer(svcCtx *svc.ServiceContext) *PermissionServiceServer {
+	return &PermissionServiceServer{
+		svcCtx: svcCtx,
+	}
+}
diff --git a/internal/server/tokenservice/token_service_server.go b/internal/server/tokenservice/token_service_server.go
index cbdaf94..6197cf3 100644
--- a/internal/server/tokenservice/token_service_server.go
+++ b/internal/server/tokenservice/token_service_server.go
@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.7.3
+// goctl 1.8.1
 // Source: permission.proto
 
 package server
diff --git a/pkg/usecase/additional.go b/pkg/usecase/additional.go
index 6bd2c1e..722ff28 100644
--- a/pkg/usecase/additional.go
+++ b/pkg/usecase/additional.go
@@ -15,6 +15,10 @@ func (use *additional) GetAll() map[string]string {
 }
 
 func (use *additional) Set(key token.Additional, val string) {
+	if use.additional == nil {
+		use.additional = make(map[string]string)
+	}
+
 	use.additional[key.String()] = val
 }