From e94b30b9b4e99611ac1b9491cd3d6d02e6c22e90 Mon Sep 17 00:00:00 2001
From: bearns <alex@bearns.me>
Date: Sun, 18 Oct 2020 14:33:14 +0300
Subject: [PATCH] Revert "Ubuntu packages"

This reverts commit 74129dd1a0b2370118226268d446d0bb649f594a.
---
 web/Dockerfile | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/web/Dockerfile b/web/Dockerfile
index 4fd8885..7023d81 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,29 +1,30 @@
-FROM ubuntu
+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
+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 ;
+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
 
-RUN 	cd /etc/apache2/conf.d/ ; \
+#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 \
 		;