Enable shutdown with gitblit-stop.shcommand.

Clean up by deleting not needed scripts for service start.

For Alpine, change `/bin/bash` to `/bin/sh` so that the scripts can run.

Add `/opt/gitblit` to the path. Together with the `WORKDIR` this enables
calling scripts in `/opt/giblit` in a `docker exec` command.
Alas, not every script does work with Alpine's shell.

Author: flaix

Dockerfile

@@ -4,7 +4,6 @@ ENV GITBLIT_VERSION 1.9.0
 ENV GITBLIT_DOWNLOAD_SHA 349302ded75edfed98f498576861210c0fe205a8721a254be65cdc3d8cdd76f1
 
 LABEL maintainer="James Moger <james.moger@gitblit.com>, Florian Zschocke <f.zschocke+gitblit@gmail.com>" \
-      author="Bala Raman <srbala [at] gmail.com>" \
       org.label-schema.schema-version="1.0" \
       org.label-schema.version="${GITBLIT_VERSION}"
 
@@ -25,7 +24,8 @@ RUN set -eux ; \
 
 
 # Move the data files to a separate directory and set some defaults
-RUN mv /opt/gitblit/data /opt/gitblit-data ; \
+RUN set -eux ; \
+    mv /opt/gitblit/data /opt/gitblit-data ; \
     ln -s /opt/gitblit-data /opt/gitblit/data ; \
 # Create a system.properties file that sets the defaults for this docker setup.
     echo "server.httpPort=8080" >> /opt/gitblit/system.properties ; \
@@ -70,10 +70,16 @@ include = defaults.properties,/opt/gitblit/system.properties,gitblit-docker.prop
 ''#\n\
 ''# Define your overrides or custom settings below\n\
 ''#\n\
-\n' > /opt/gitblit-data/gitblit.properties
+\n' > /opt/gitblit-data/gitblit.properties ; \
+\
+# Remove unneeded scripts.
+    rm -f /opt/gitblit/install-service-*.sh ; \
+    rm -r /opt/gitblit/service-*.sh ;
 
 
 # Setup the Docker container environment
+ENV PATH /opt/gitblit:$PATH
+
 WORKDIR /opt/gitblit
 
 EXPOSE 8080 8443 9418 29418

Dockerfile.alpine

@@ -4,7 +4,6 @@ ENV GITBLIT_VERSION 1.9.0
 ENV GITBLIT_DOWNLOAD_SHA 349302ded75edfed98f498576861210c0fe205a8721a254be65cdc3d8cdd76f1
 
 LABEL maintainer="James Moger <james.moger@gitblit.com>, Florian Zschocke <f.zschocke+gitblit@gmail.com>" \
-      author="Bala Raman <srbala [at] gmail.com>" \
       org.label-schema.schema-version="1.0" \
       org.label-schema.version="${GITBLIT_VERSION}"
 
@@ -25,7 +24,8 @@ RUN set -eux; \
 
 
 # Move the data files to a separate directory and set some defaults
-RUN mv /opt/gitblit/data /opt/gitblit-data ; \
+RUN set -eux ; \
+    mv /opt/gitblit/data /opt/gitblit-data ; \
     ln -s /opt/gitblit-data /opt/gitblit/data ; \
 # Create a system.properties file that sets the defaults for this docker setup.
     echo "server.httpPort=8080" >> /opt/gitblit/system.properties ; \
@@ -70,10 +70,23 @@ include = defaults.properties,/opt/gitblit/system.properties,gitblit-docker.prop
 ''#\n\
 ''# Define your overrides or custom settings below\n\
 ''#\n\
-\n' > /opt/gitblit-data/gitblit.properties
+\n' > /opt/gitblit-data/gitblit.properties ; \
+\
+# Remove unneeded scripts.
+    rm -f /opt/gitblit/install-service-*.sh ; \
+    rm -r /opt/gitblit/service-*.sh ;
+
+
+# Change shell to 'sh' for Alpine
+RUN set -eux ; \
+    for file in /opt/gitblit/*.sh ; do \
+        sed -i -e 's;bin/bash;bin/sh;' $file ; \
+    done
 
 
 # Setup the Docker container environment
+ENV PATH /opt/gitblit:$PATH
+
 WORKDIR /opt/gitblit
 
 EXPOSE 8080 8443 9418 29418

README.md

@@ -16,12 +16,12 @@ The followings commands should retrieve and execute the Gitblit image and launch
 
 You should be able to browse to http://localhost:8080 or https://localhost:8443 and login as `admin/admin`.
 
-You can stop your container with:
+You can shutdown your gitblit container with:
 ```
-sudo docker stop gitblit
+sudo docker exec -it gitblit gitblit-stop.sh
 ```
 
-You can manually start your container with:
+You can manually re-start your container with:
 ```
 sudo docker start gitblit
 ```

hub-readme.md

@@ -32,6 +32,20 @@ You can select which transports you want to make available from the container. F
 sudo docker run -d --name gitblit -p 8443:8443 -p 29418:29418 gitblit/gitblit:rpc
 ```
 
+### Stop the container
+
+Gitblit can be shut down cleanly with the `gitblit-stop.h` script.
+
+```console
+sudo docker exec -it gitblit gitblit-stop.sh
+```
+
+You can also stop the container with a normal stop command.
+
+```console
+sudo docker stop gitblit
+```
+
 
 # Image Variants
 The `gitblit/gitblit` images come in multiple flavors, each designed for a specific use case.