diff --git a/Dockerfile b/Dockerfile index a5a468fa..4f209595 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,13 @@ FROM golang:1.18-stretch as builder ARG VER=devel +RUN mkdir -p /out ADD . /src/ -WORKDIR /src/sshpiperd -RUN CGO_ENABLED=0 go build -ldflags "-X main.version=$VER" -o /sshpiperd +WORKDIR /src/cmd/sshpiperd +RUN CGO_ENABLED=0 go build -ldflags "-X main.mainver=$VER" -o /out/sshpiperd +WORKDIR /src/plugin/workingdir +RUN CGO_ENABLED=0 go build -o /out/workingdir FROM busybox LABEL maintainer="Boshi Lian" @@ -13,8 +16,9 @@ LABEL maintainer="Boshi Lian" RUN mkdir /etc/ssh/ ADD entrypoint.sh / -COPY --from=builder /sshpiperd / +COPY --from=builder /out/* / +COPY --from=ep76/openssh-static:latest /usr/bin/ssh-keygen /ssh-keygen EXPOSE 2222 ENTRYPOINT ["/entrypoint.sh"] -CMD ["/sshpiperd", "daemon"] +CMD ["/sshpiperd", "/workingdir"] diff --git a/entrypoint.sh b/entrypoint.sh index 8ace1a19..384a678a 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,7 +3,7 @@ set -euo pipefail if [ ! -f /etc/ssh/ssh_host_rsa_key ];then - /sshpiperd genkey > /etc/ssh/ssh_host_rsa_key + /ssh-keygen -t rsa -N '' -f /etc/ssh/ssh_host_rsa_key fi exec "$@"