Use a different path for temp directory, which can be deleted

The containerised version defines a path for the temporary folder to
be used by Gitblit. This is so that one can choose to mount a tmpfs
in the container at this path. But Gitblit tries to delete the folder
when it starts to make sure it is empty. This does not work when the
folder path is a mount point. So instead, a folder `gitblit` inside
the temporary folder is set as temp folder for Gitblit, which can be
deleted and recreated.
This fixes #12

Author: flaix

Dockerfile

@@ -96,7 +96,7 @@ s/^server.redirectToHttpsPort.*/#server.redirectToHttpsPort = true/\n\
     echo "filestore.storageFolder = ${gbsrv}/lfs" >> /opt/gitblit/etc/system.properties ; \
     echo "tickets.indexFolder = ${gbsrv}/tickets/lucene" >> /opt/gitblit/etc/system.properties ; \
     echo "federation.proposalsFolder = ${gbsrv}/fedproposals" >> /opt/gitblit/etc/system.properties ; \
-    echo "server.tempFolder = ${GITBLIT_VAR}/temp" >> /opt/gitblit/etc/system.properties ; \
+    echo "server.tempFolder = ${GITBLIT_VAR}/temp/gitblit" >> /opt/gitblit/etc/system.properties ; \
     echo "server.httpPort = 8080" >> /opt/gitblit/etc/system.properties ; \
     echo "server.httpsPort = 8443" >> /opt/gitblit/etc/system.properties ; \
     echo "server.redirectToHttpsPort = true" >> /opt/gitblit/etc/system.properties ; \
@@ -191,3 +191,4 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 # 29418: SSH transport
 EXPOSE 8080 8443 9418 29418
 CMD ["gitblit"]
+

Dockerfile.alpine

@@ -96,7 +96,7 @@ s/^server.redirectToHttpsPort.*/#server.redirectToHttpsPort = true/\n\
     echo "filestore.storageFolder = ${gbsrv}/lfs" >> /opt/gitblit/etc/system.properties ; \
     echo "tickets.indexFolder = ${gbsrv}/tickets/lucene" >> /opt/gitblit/etc/system.properties ; \
     echo "federation.proposalsFolder = ${gbsrv}/fedproposals" >> /opt/gitblit/etc/system.properties ; \
-    echo "server.tempFolder = ${GITBLIT_VAR}/temp" >> /opt/gitblit/etc/system.properties ; \
+    echo "server.tempFolder = ${GITBLIT_VAR}/temp/gitblit" >> /opt/gitblit/etc/system.properties ; \
     echo "server.httpPort = 8080" >> /opt/gitblit/etc/system.properties ; \
     echo "server.httpsPort = 8443" >> /opt/gitblit/etc/system.properties ; \
     echo "server.redirectToHttpsPort = true" >> /opt/gitblit/etc/system.properties ; \
@@ -191,3 +191,4 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 # 29418: SSH transport
 EXPOSE 8080 8443 9418 29418
 CMD ["gitblit"]
+

generate/Dockerfile.template

@@ -1,3 +1,4 @@
+% #!/bin/bash
 % #
 % # Full fledged script that can be used with parameters
 % #
@@ -316,7 +317,7 @@ s/^server.redirectToHttpsPort.*/#server.redirectToHttpsPort = true/\n\
     echo "filestore.storageFolder = ${gbsrv}/lfs" >> /opt/gitblit/etc/system.properties ; \
     echo "tickets.indexFolder = ${gbsrv}/tickets/lucene" >> /opt/gitblit/etc/system.properties ; \
     echo "federation.proposalsFolder = ${gbsrv}/fedproposals" >> /opt/gitblit/etc/system.properties ; \
-    echo "server.tempFolder = ${GITBLIT_VAR}/temp" >> /opt/gitblit/etc/system.properties ; \
+    echo "server.tempFolder = ${GITBLIT_VAR}/temp/gitblit" >> /opt/gitblit/etc/system.properties ; \
     echo "server.httpPort = 8080" >> /opt/gitblit/etc/system.properties ; \
     echo "server.httpsPort = 8443" >> /opt/gitblit/etc/system.properties ; \
     echo "server.redirectToHttpsPort = true" >> /opt/gitblit/etc/system.properties ; \
@@ -489,3 +490,4 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 # 29418: SSH transport
 EXPOSE 8080 8443 9418 29418
 CMD ["gitblit"]
+

generate/generate_dockerfile.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Full fledged script that can be used with parameters
 #
@@ -308,7 +309,7 @@ printf "%s\n" \#\ This\ is\ not\ available\ outside\ and\ should\ not\ be\ chang
     printf "%s\n" \ \ \ \ echo\ \"filestore.storageFolder\ =\ \$\{gbsrv\}/lfs\"\ \>\>\ /opt/gitblit/etc/system.properties\ \;\ \\
     printf "%s\n" \ \ \ \ echo\ \"tickets.indexFolder\ =\ \$\{gbsrv\}/tickets/lucene\"\ \>\>\ /opt/gitblit/etc/system.properties\ \;\ \\
     printf "%s\n" \ \ \ \ echo\ \"federation.proposalsFolder\ =\ \$\{gbsrv\}/fedproposals\"\ \>\>\ /opt/gitblit/etc/system.properties\ \;\ \\
-    printf "%s\n" \ \ \ \ echo\ \"server.tempFolder\ =\ \$\{GITBLIT_VAR\}/temp\"\ \>\>\ /opt/gitblit/etc/system.properties\ \;\ \\
+    printf "%s\n" \ \ \ \ echo\ \"server.tempFolder\ =\ \$\{GITBLIT_VAR\}/temp/gitblit\"\ \>\>\ /opt/gitblit/etc/system.properties\ \;\ \\
     printf "%s\n" \ \ \ \ echo\ \"server.httpPort\ =\ 8080\"\ \>\>\ /opt/gitblit/etc/system.properties\ \;\ \\
     printf "%s\n" \ \ \ \ echo\ \"server.httpsPort\ =\ 8443\"\ \>\>\ /opt/gitblit/etc/system.properties\ \;\ \\
     printf "%s\n" \ \ \ \ echo\ \"server.redirectToHttpsPort\ =\ true\"\ \>\>\ /opt/gitblit/etc/system.properties\ \;\ \\
@@ -478,3 +479,4 @@ printf "%s\n" \#\ 9418:\ \ Git\ protocol\ transport
 printf "%s\n" \#\ 29418:\ SSH\ transport
 printf "%s\n" EXPOSE\ 8080\ 8443\ 9418\ 29418
 printf "%s\n" CMD\ \[\"gitblit\"\]
+printf "\n"

goss.yaml

@@ -35,7 +35,7 @@ file:
     filetype: file
     exists: true
     mode: "0644"
-    size: 345
+    size: 353
     owner: root
     group: root