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" )