Revert "Ubuntu packages"

This reverts commit 74129dd1a0.

web/Dockerfile

@@ -1,43 +1,35 @@
-FROM ubuntu
+FROM alpine:edge
 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
+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
 
-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 ; \
-  	 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/* ; \
-  	 rm /etc/apache2/mods-enabled/*svn* ;
+RUN apk update ; \
+	 apk add -v apache2 ; \
+	 apk add -v apache2-proxy ; \
+	 apk add -v apache2-webdav ; \
+	 apk add -v mod_dav_svn ; \
+	 apk add -v perl-dbi ; \
+	 apk add -v perl-dbd-mysql ; \
+	 apk add -v perl-ldap ; \
+	 apk add -v subversion ;
 
 # --chown=www-data:www-data
-ADD ./redmine.conf /etc/apache2/sites-enabled/redmine.conf
+ADD ./redmine.conf /etc/apache2/conf.d/redmine.conf
 
-RUN 	cd /etc/apache2/sites-enabled/ ; \
-  		sed -i'' "s/redminedbpassword/$MYSQL_PASSWORD/g" redmine.conf \
-  		;
+#Not in edge repository, use test branch
+RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+		apache2-mod-perl \
+		; \
+		cd /etc/apache2/conf.d/ ; \
+		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/site_perl/Apache/Authn/Redmine.pm
+ADD ./Redmine.pm /usr/local/lib/perl5/site_perl/Apache/Authn/Redmine.pm
 
 WORKDIR /var
 
@@ -45,4 +37,4 @@ STOPSIGNAL SIGWINCH
 
 EXPOSE 80
 
-CMD ["apachectl", "-D", "FOREGROUND"]
+CMD ["httpd", "-DFOREGROUND"]

web/redmine.conf

@@ -36,8 +36,8 @@
 #Group daemon
 #</IfModule>
 
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so
+#LoadModule proxy_module modules/mod_proxy.so
+#LoadModule proxy_http_module modules/mod_proxy_http.so
 
 ProxyPass / http://redmine:3000/
 
@@ -48,8 +48,8 @@ LoadModule perl_module modules/mod_perl.so
 
 PerlLoadModule Apache::Authn::Redmine
 
-LoadModule dav_module /usr/lib/apache2/modules/mod_dav.so
-LoadModule dav_svn_module /usr/lib/apache2/modules/mod_dav_svn.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_svn_module modules/mod_dav_svn.so
 
 <Location /svn>
   DAV svn
@@ -62,7 +62,7 @@ LoadModule dav_svn_module /usr/lib/apache2/modules/mod_dav_svn.so
   ## for mysql
   RedmineDSN "DBI:mysql:database=redmine;host=db"
   RedmineDbUser "root"
-  RedmineDbPass "mrpassword"
+  RedmineDbPass "redminedbpassword"
   ## Optional where clause (fulltext search would be slow and
   ## database dependent).
   # RedmineDbWhereClause "and members.role_id IN (1,2)"