From 9cf418ff09da5b379800b73b8feaa8f4dfcc9386 Mon Sep 17 00:00:00 2001
From: bearns <alex@bearns.me>
Date: Sun, 18 Oct 2020 14:34:59 +0300
Subject: [PATCH] Ubuntu packages

---
 web/Dockerfile | 79 +++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/web/Dockerfile b/web/Dockerfile
index 7023d81..299b904 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,40 +1,39 @@
-FROM alpine:edge
-ARG MYSQL_ROOT_PASSWORD
-ENV MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD}
-
-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 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/conf.d/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/perl5/site_perl/Apache/Authn/Redmine.pm
-
-WORKDIR /var
-
-STOPSIGNAL SIGWINCH
-
-EXPOSE 80
-
-CMD ["httpd", "-DFOREGROUND"]
+    FROM ubuntu
+    ARG MYSQL_ROOT_PASSWORD
+    ENV MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD}
+
+    #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 \
+    		;
+    		
+    #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
+
+    WORKDIR /var
+
+    STOPSIGNAL SIGWINCH
+
+    EXPOSE 80
+
+    CMD ["httpd", "-DFOREGROUND"]
\ No newline at end of file