Fix access right to the volume repository from www-data user in the c…

…ontainer

Dockerfile

@@ -39,8 +39,9 @@ RUN mkdir /wiki-setup
 RUN chown www-data: /wiki-setup
 
 # Startup program configuration
-COPY setup.pl /wiki-setup
-RUN chown www-data: /wiki-setup/setup.pl
+COPY setup.sh /wiki-setup
+RUN chown www-data: /wiki-setup/setup.sh
+RUN chmod 755 /wiki-setup/setup.sh
 COPY ikiwiki_supervisord.conf /etc/supervisor/conf.d
 
 # Setup the lighttpd configuration
@@ -49,4 +50,4 @@ COPY ikiwiki_supervisord.conf /etc/supervisor/conf.d
 VOLUME /wiki
 EXPOSE 22
 EXPOSE 80
-CMD su www-data -c /wiki-setup/setup.pl && supervisord -n
+CMD /wiki-setup/setup.sh && supervisord -n

setup.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+die() {
+    echo $0
+    exit 1
+}
+
+cd /wiki
+git status 2>&1 > /dev/null
+if [[ $? -ne 0 ]] ; then
+    die "Can not find a git repository at /wiki"
+fi
+cd -
+
+set -e
+git clone --bare /wiki /var/www/wiki.git
+chown -R www-data: /var/www/wiki.git
+tmpfile=$(mktemp)
+cat > $tmpfile <<EOF
+#!/bin/bash
+git clone /var/www/wiki.git /var/www/wiki-src
+ikiwiki --setup /etc/ikiwiki/ikiwiki.setup --rebuild --wrappers
+EOF
+chmod 755 $tmpfile
+su www-data -c $tmpfile
+
+echo "The setup script has been run"