Cleaning up

Author: rupor-github

Dockerfile

@@ -1,8 +1,6 @@
 FROM alpine:3.14
 MAINTAINER rupor (https://github.com/rupor-github/serve-svn)
 
-ARG SVN_UID=1000
-ARG SVN_GID=1000
 ENV SRV_HOST_PORT=
 
 ENV S6_OVERLAY_VERSION=2.2.0.3
@@ -14,9 +12,6 @@ RUN apk add --no-cache shadow ca-certificates \
 	php7 php7-apache2 php7-session php7-json php7-xml && \
 	mkdir -p /run/apache2/
 
-# ensure, apache user can handle svn
-RUN if [ "$SVN_UID" != "100" ] ; then usermod -u $SVN_UID apache && groupmod -g $SVN_GID apache ; fi
-
 # For some reason Alpine subversion build does not have svnauthz (or any svn tools for this matter) - have to build my own
 COPY replace/subversion-1.14.1-r3.apk /tmp/
 RUN apk add --no-cache --allow-untrusted /tmp/subversion-1.14.1-r3.apk && \

README.md

@@ -1,19 +1,38 @@
 # serve-svn
-## Very simple container to run WebSVN viewer and provide access to svn utilities and svnserve.
+## Very simple container to run WebSVN viewer and provide access to svn utilities and protocol.
+
+I am using this container on my Synology NAS to have access to old code - recently DSM 7.0 dropped svn support and I am to lazy to move old code to git.
+
+Normally I run it in read only mode, viewer is fully functional and you could use svn:// protocol to list things:
+
+        sudo docker run -d --name svn -p 4000:80 -p 3690:3690 \
+                -e SRV_HOST_PORT=192.168.50.10:4000 \
+                -v /volume/docker/svn/data:/home/svn:ro \
+                rupor/serve-svn
+
+Since `svnadmin` does not care about access control lists you could always add more repositories:
+
+		sudo docker exec -t svn svnadmin create /home/svn/<another repo>
+		sudo docker exec -t svn svnadmin load /home/svn/<another repo> < dump
+
+It is easy however to get a full access:
 
         sudo docker run -d --name svn -p 4000:80 -p 3690:3690 \
                 -e SRV_HOST_PORT=192.168.50.10:4000 \
                 -v /volume4/docker/svn/data:/home/svn \
                 -v /volume4/docker/svn/svn/subversion-access-control:/etc/subversion/subversion-access-control \
                 -v /volume4/docker/svn/svn/passwd:/etc/subversion/passwd \
-                localhost/serve-svn
+                rupor/serve-svn
 
-By default eveything is in read-only mode, but it could be recofigured easily. In this case following could be halpful:
+In this case you may want to change SVN access control lists and add users:
 
-        docker exec -t svn-server htpasswd -b /etc/subversion/passwd <username> <password>
+        sudo docker exec -t svn htpasswd -b /etc/subversion/passwd <username> <password>
 
-For some reason Alpine's build of subversion does not have svntools and without `svnauthz` [WebSVN](https://websvnphp.github.io/) refuses to work. So I had to build my own. Setting up build environment is very simple. I 
-used [this](https://github.com/yuk7/AlpineWSL) to install Alpine 3.14 under WSL2 in Windows 10 and then followed [the official guide](https://wiki.alpinelinux.org/wiki/Creating_an_Alpine_package#Setup_your_system_and_account). Takes about 3 minutes to complete.
+## Technicalities
+
+For some reason Alpine's build of subversion does not have svntools and without `svnauthz` [WebSVN](https://websvnphp.github.io/) refuses to work. So I had to build my own.
+Setting up build environment is very simple. I used [this](https://github.com/yuk7/AlpineWSL) to install Alpine 3.14 under WSL2 in Windows 10 (you could use Hyper-V or VirtualBox too)
+and then followed [the official guide](https://wiki.alpinelinux.org/wiki/Creating_an_Alpine_package#Setup_your_system_and_account). Takes about 3 minutes to complete.
 
 Building Subversion with `svnauthz` requires a simple patch:
 
@@ -35,6 +54,7 @@ Building Subversion with `svnauthz` requires a simple patch:
                         PERL_INSTALL_ROOT="$pkgdir"
                 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 
-I am using this container on my Synology to have access to very old code - recently DSM 7.0 dropped svn support and I am to lazy to move old code to git.
+## Credits
+
+* Thanks to [Luca Florio](https://github.com/elleFlorio) with his [elleFlorio/svn-docker](https://github.com/elleFlorio/svn-docker) for inspiration.
 
-Enjoy

replace/config.php

@@ -113,8 +113,9 @@
 // Note that in this case the path is a filesystem path and depends on your platform:
 //   Unix-like: /path/to/parent
 //   Windows: c:\\svn
-//
+
 $config->parentPath('/home/svn');
+
 // $config->parentPath('filesystem path', 'group');
 //
 // To exclude a repository from being added by the parentPath method uncomment the next line
@@ -204,7 +205,7 @@
 // By default, WebSVN does not ignore whitespaces when showing diffs.
 // To enable ignoring whitespaces in diffs per default uncomment this line.
 
-// $config->setIgnoreWhitespacesInDiff(true);
+$config->setIgnoreWhitespacesInDiff(true);
 
 // }}}
 
@@ -317,7 +318,7 @@
 // Uncomment the line below to offer a tarball download option across all your
 // repositories.
 //
-// $config->allowDownload();
+$config->allowDownload();
 //
 // Set download modes
 // $config->setDefaultFileDlMode('plain');
@@ -511,7 +512,7 @@
 
 // Number of spaces to expand tabs to in diff/listing view across all repositories
 
-$config->expandTabsBy(8);
+$config->expandTabsBy(4);
 
 // To override the global setting for individual repositories, uncomment and replicate
 // the line below (replacing 'myrep' with the name of the repository).