From 519c16579a16ac3c4b0c5580619113b5891cfe8c Mon Sep 17 00:00:00 2001
From: Hiroyuki Kaneko <neconoko@gmail.com>
Date: Tue, 7 Jan 2020 01:28:08 +0000
Subject: [PATCH 1/2] Changed the root user to a non-root user

---
 4/Dockerfile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/4/Dockerfile b/4/Dockerfile
index 041897a..e6a0a82 100644
--- a/4/Dockerfile
+++ b/4/Dockerfile
@@ -4,14 +4,22 @@ LABEL maintainer="Naoki Takezoe <takezoe [at] gmail.com>"
 
 ADD https://github.com/gitbucket/gitbucket/releases/download/4.33.0/gitbucket.war /opt/gitbucket.war
 
-RUN ln -s /gitbucket /root/.gitbucket
+ENV GITBUCKET_HOME=/gitbucket
+
+# Give permissions for root group
+RUN chmod g=u /opt/gitbucket.war && \
+    mkdir -p $GITBUCKET_HOME && \
+    chmod g+w $GITBUCKET_HOME
+
+VOLUME $GITBUCKET_HOME
 
-VOLUME /gitbucket
 
 # Port for web page
 EXPOSE 8080
 # Port for SSH access to git repository (Optional)
 EXPOSE 29418
 
+USER 1001
+
 CMD ["sh", "-c", "java -jar /opt/gitbucket.war"]
 

From 4569b5fb6b0bd6ab429d0c8a7e111f6f9d1ef736 Mon Sep 17 00:00:00 2001
From: Hiroyuki Kaneko <hkaneko@redhat.com>
Date: Fri, 1 May 2020 06:19:52 -0700
Subject: [PATCH 2/2] Fix to be able to set USER id when the container is build

---
 4/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/4/Dockerfile b/4/Dockerfile
index e6a0a82..6c65b8d 100644
--- a/4/Dockerfile
+++ b/4/Dockerfile
@@ -19,7 +19,8 @@ EXPOSE 8080
 # Port for SSH access to git repository (Optional)
 EXPOSE 29418
 
-USER 1001
+ARG USERID=1001
+USER ${USERID}
 
 CMD ["sh", "-c", "java -jar /opt/gitbucket.war"]