From 7c039f9b375d62a352dcf62b441f53d3e19cdf3e Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Tue, 28 Feb 2023 11:47:56 +0800
Subject: [PATCH] chore(docker): run as non root user in container (#727)

---
 docker/Dockerfile | 7 +++++++
 router/version.go | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 83eac3a..fbf6922 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,17 +2,24 @@ FROM alpine:3.17
 
 ARG TARGETOS
 ARG TARGETARCH
+ARG USER=gorush
+ENV HOME /home/$USER
 
 LABEL maintainer="Bo-Yi Wu <appleboy.tw@gmail.com>" \
   org.label-schema.name="Gorush" \
   org.label-schema.vendor="Bo-Yi Wu" \
   org.label-schema.schema-version="1.0"
 
+# add new user
+RUN adduser -D $USER
 RUN apk add --no-cache ca-certificates mailcap && \
   rm -rf /var/cache/apk/*
 
 COPY release/${TARGETOS}/${TARGETARCH}/gorush /bin/
 
+USER $USER
+WORKDIR $HOME
+
 EXPOSE 8088 9000
 HEALTHCHECK --start-period=1s --interval=10s --timeout=5s \
   CMD ["/bin/gorush", "--ping"]
diff --git a/router/version.go b/router/version.go
index a1b695d..8198107 100644
--- a/router/version.go
+++ b/router/version.go
@@ -29,9 +29,13 @@ func GetVersion() string {
 
 // PrintGoRushVersion provide print server engine
 func PrintGoRushVersion() {
+	if len(commit) > 7 {
+		commit = commit[:7]
+	}
+
 	fmt.Printf(`GoRush %s, Commit: %s, Compiler: %s %s, Copyright (C) 2023 Bo-Yi Wu, Inc.`,
 		version,
-		commit[:7],
+		commit,
 		runtime.Compiler,
 		runtime.Version())
 	fmt.Println()