summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile7
-rwxr-xr-xsrc/git-run2
2 files changed, 6 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index 5cb9232..07830f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ ARG BASE_IMAGE=alpine:latest
FROM ${BASE_IMAGE}
-RUN apk add --no-cache openssh-server fish git sudo
+RUN apk add --no-cache openssh-server fish git sudo tini
# default uid for git user who has access to all repos
ENV GIT_UID=1000
@@ -23,7 +23,10 @@ RUN chmod 755 /usr/local/bin/git-run
COPY src/version /usr/local/bin/
COPY src/banner /usr/local/bin/
-ENTRYPOINT ["/usr/local/bin/init"]
+# we need a init that reaps zombies
+ENTRYPOINT ["tini"]
+# setups users and starts sshd daemon
+CMD ["/usr/local/bin/init"]
ARG APP_VERSION
diff --git a/src/git-run b/src/git-run
index 8a0da81..c03ace8 100755
--- a/src/git-run
+++ b/src/git-run
@@ -78,4 +78,4 @@ begin
end &>>$_LOG
# execute parsed git command
-/usr/bin/sudo -u git /usr/bin/git-shell -c "$gitCommand '$repoDir'"
+/usr/bin/sudo -n -u git /usr/bin/git-shell -c "$gitCommand '$repoDir'" \ No newline at end of file