From 636a9b04ee31f4593fe3b51785563bf2b994c71f Mon Sep 17 00:00:00 2001
From: bearns <alex@bearns.me>
Date: Sun, 18 Oct 2020 15:38:54 +0300
Subject: [PATCH] Unable to locate package libapache2-svn

---
 web/Dockerfile   | 64 +++++++++++++++++++++++++++---------------------
 web/redmine.conf |  2 +-
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/web/Dockerfile b/web/Dockerfile
index 299b904..0d369ac 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,39 +1,47 @@
-    FROM ubuntu
-    ARG MYSQL_ROOT_PASSWORD
-    ENV MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD}
+FROM ubuntu
+ARG MYSQL_ROOT_PASSWORD
+ENV MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD}
+    
+ENV TZ=Europe/Moscow
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+ENV DEBIAN_FRONTEND="noninteractive"
 
     #RUN set -x \
     #	&& addgroup -g 82 -S www-data \
     #	&& adduser -u 82 -D -S -G www-data www-data
     # 82 is the standard uid/gid for "www-data" in Alpine
 
-    RUN apt-get update ; \
-    	 apt-get install -y apache2 ; \
-    	 a2enmod proxy ; \
-    	 a2enmod dav_fs ; \
-    	 a2enmod auth_basic ; \
-    	 apt-get install -y libapache2-svn ; \
-    	 a2enmod dav_svn ; \
-    	 apt-get install -y libapache-dbi-perl ; \
-    	 apt-get install -y libdbd-mysql-perl ; \
-    	 apt-get install -y libnet-ldap-perl ; \
-    	 apt-get install -y subversion subversion-tools ; \
-    	 apt-get install -y libapache2-mod-perl2 ;
-
-    # --chown=www-data:www-data
-    ADD ./redmine.conf /etc/apache2/conf.d/redmine.conf
-
-    RUN 	cd /etc/apache2/conf.d/ ; \
-    		sed -i'' "s/redminedbpassword/$MYSQL_PASSWORD/g" redmine.conf \
-    		;
+RUN apt-get update ; \
+  	 apt-get install -y apache2 ; \
+  	 a2enmod proxy ; \
+  	 a2enmod dav_fs ; \
+  	 a2enmod auth_basic ; \
+  	 apt-get install -y libapache2-svn ; \
+  	 apt-get install -y libapache2-mod-svn libsvn-dev ; \
+  	 a2enmod dav ; \
+  	 a2enmod dav_svn ; \
+  	 apt-get install -y libapache-dbi-perl ; \
+  	 apt-get install -y libdbd-mysql-perl ; \
+  	 apt-get install -y libnet-ldap-perl ; \
+  	 apt-get install -y subversion subversion-tools ; \
+  	 apt-get install -y libapache2-mod-perl2 ; \
+  	 rm /etc/apache2/sites-enabled/* ;
+
+# --chown=www-data:www-data
+ADD ./redmine.conf /etc/apache2/sites-enabled/redmine.conf
+
+RUN 	cd /etc/apache2/sites-enabled/ ; \
+  		sed -i'' "s/redminedbpassword/$MYSQL_PASSWORD/g" redmine.conf \
+  		;
     		
-    #https://www.redmine.org/projects/redmine/repository/entry/trunk/extra/svn/Redmine.pm
-    ADD ./Redmine.pm /usr/local/lib/perl5/site_perl/Apache/Authn/Redmine.pm
+#https://www.redmine.org/projects/redmine/repository/entry/trunk/extra/svn/Redmine.pm
+ADD ./Redmine.pm /usr/local/lib/site_perl/Apache/Authn/Redmine.pm
 
-    WORKDIR /var
+WORKDIR /var
 
-    STOPSIGNAL SIGWINCH
+STOPSIGNAL SIGWINCH
 
-    EXPOSE 80
+EXPOSE 80
 
-    CMD ["httpd", "-DFOREGROUND"]
\ No newline at end of file
+CMD ["apachectl", "-D", "FOREGROUND"]
\ No newline at end of file
diff --git a/web/redmine.conf b/web/redmine.conf
index bc410a1..1bb7fef 100644
--- a/web/redmine.conf
+++ b/web/redmine.conf
@@ -48,7 +48,7 @@ LoadModule perl_module modules/mod_perl.so
 
 PerlLoadModule Apache::Authn::Redmine
 
-LoadModule dav_module modules/mod_dav.so
+#LoadModule dav_module modules/mod_dav.so
 LoadModule dav_svn_module modules/mod_dav_svn.so
 
 <Location /svn>