Change web ports to 8080 and 8443

The default should be the non-privileged ports. This is also in
preparation of running as non-root user.

Update the Readme with current information.

Author: flaix

Dockerfile

@@ -24,16 +24,16 @@ RUN set -eux ; \
     rm -f gitblit.tar.gz ; \
     mv /opt/gitblit/data /opt/gitblit-data ; \
     ln -s /opt/gitblit-data /opt/gitblit/data ; \
-    echo "server.httpPort=80" >> /opt/gitblit-data/gitblit.properties ; \
-    echo "server.httpsPort=443" >> /opt/gitblit-data/gitblit.properties ; \
+    echo "server.httpPort=8080" >> /opt/gitblit-data/gitblit.properties ; \
+    echo "server.httpsPort=8443" >> /opt/gitblit-data/gitblit.properties ; \
     echo "server.redirectToHttpsPort=true" >> /opt/gitblit-data/gitblit.properties ; \
     echo "web.enableRpcManagement=true" >> /opt/gitblit-data/gitblit.properties ; \
     echo "web.enableRpcAdministration=true" >> /opt/gitblit-data/gitblit.properties
 
 # Setup the Docker container environment
 WORKDIR /opt/gitblit
 
-EXPOSE 80 443 9418 29418
+EXPOSE 8080 8443 9418 29418
 
 # run application
 CMD ["java", "-server", "-Xmx1024M", "-Djava.awt.headless=true", "-cp", "gitblit.jar:ext/*", "com.gitblit.GitBlitServer", "--baseFolder", "/opt/gitblit-data"]

Dockerfile.alpine

@@ -20,16 +20,16 @@ RUN set -eux; \
     rm -f gitblit.tar.gz ; \
     mv /opt/gitblit/data /opt/gitblit-data ; \
     ln -s /opt/gitblit-data /opt/gitblit/data ; \
-    echo "server.httpPort=80" >> /opt/gitblit-data/gitblit.properties ; \
-    echo "server.httpsPort=443" >> /opt/gitblit-data/gitblit.properties ; \
+    echo "server.httpPort=8080" >> /opt/gitblit-data/gitblit.properties ; \
+    echo "server.httpsPort=8443" >> /opt/gitblit-data/gitblit.properties ; \
     echo "server.redirectToHttpsPort=true" >> /opt/gitblit-data/gitblit.properties ; \
     echo "web.enableRpcManagement=true" >> /opt/gitblit-data/gitblit.properties ; \
     echo "web.enableRpcAdministration=true" >> /opt/gitblit-data/gitblit.properties
 
 # Setup the Docker container environment
 WORKDIR /opt/gitblit
 
-EXPOSE 80 443 9418 29418
+EXPOSE 8080 8443 9418 29418
 
 # run application
 CMD ["java", "-server", "-Xmx1024M", "-Djava.awt.headless=true", "-cp", "gitblit.jar:ext/*", "com.gitblit.GitBlitServer", "--baseFolder", "/opt/gitblit-data"]

README.md

@@ -1,33 +1,29 @@
 # Gitblit & Docker
 
-These instructions assume you are running Ubuntu and you have already installed Docker.
+These instructions assume you are running Linux and you have already [installed Docker](https://docs.docker.com/install/linux/docker-ce/ubuntu/).
 
-```
-sudo apt-get install docker.io
-```
 
 ## Running Gitblit in Docker
 
-You can use the Gitblit Docker image I have created [here](https://registry.hub.docker.com/u/jmoger/gitblit).
+You can use the official [Gitblit Docker image](https://hub.docker.com/r/gitblit/gitblit).
 
 ```
-sudo docker.io pull jmoger/gitblit
-<wait a while>
-sudo docker.io run -d --name gitblit -p 443:443 -p 80:80 -p 9418:9418 -p 29418:29418 jmoger/gitblit
+sudo docker pull gitblit/gitblit
+sudo docker run -d --name gitblit -p 8443:8443 -p 8080:8080 -p 9418:9418 -p 29418:29418 gitblit/gitblit
 ```
 
-The followings commands should retrieve and execute the Gitblit image and launch Gitblit in a Docker container that serves the web ui on ports 80 and 443.  Your repositories will also be accessible via ssh, http, https, and the git procotol.  The RPC administration interface has also been enabled so that you may use the Gitblit Manager to configure settings, manage repositories, or manage users.
+The followings commands should retrieve and execute the Gitblit image and launch Gitblit in a Docker container that serves the web UI on ports 8080 and 8443.  Your repositories will also be accessible via ssh, http, https, and the git procotol.  The RPC administration interface has also been enabled so that you may use the Gitblit Manager to configure settings, manage repositories, or manage users.
 
-You should be able to browse to http://localhost or https://localhost and login as `admin/admin`.
+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:
 ```
-sudo docker.io stop gitblit
+sudo docker stop gitblit
 ```
 
 You can manually start your container with:
 ```
-sudo docker.io start gitblit
+sudo docker start gitblit
 ```
 
 ## Build Instructions
@@ -41,10 +37,10 @@ git clone https://github.com/gitblit/gitblit-docker.git
 ### Build your Docker container
 ```
 cd gitblit-docker
-sudo docker.io build -t jmoger/gitblit:1.6.2 .
+sudo docker build -t my-gitblit - < Dockerfile
 ```
 ### Run your Gitblit container and setup localhost port-forwarding (*-p localhost:container*)
 ```
-sudo docker.io run -d --name gitblit -p 443:443 -p 80:80 -p 9418:9418 -p 29418:29418 jmoger/gitblit:1.6.2
+sudo docker run -d --name gitblit -p 8443:8443 -p 8080:8080 -p 9418:9418 -p 29418:29418 my-gitblit
 ```