From b4346e0ed54469440e6d8fc66b7eb0a2d95fc055 Mon Sep 17 00:00:00 2001
From: bearns <alex@bearns.me>
Date: Sun, 18 Oct 2020 12:48:10 +0300
Subject: [PATCH] Use Alpine edge image

---
 web/Dockerfile                   | 28 +++++++++++++++++++++++-----
 web/{httpd.conf => redmine.conf} |  0
 2 files changed, 23 insertions(+), 5 deletions(-)
 rename web/{httpd.conf => redmine.conf} (100%)

diff --git a/web/Dockerfile b/web/Dockerfile
index 66655c9..dd054dc 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,18 +1,36 @@
-FROM httpd:alpine
+FROM alpine:edge
 ARG MYSQL_ROOT_PASSWORD
 ENV MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD}
-ADD ./httpd.conf /usr/local/apache2/conf/httpd.conf
-RUN apk update ; \ 
+
+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 mod_dav_svn ; \
 	 apk add -v perl-dbi ; \
 	 apk add -v perl-dbd-mysql ; \
 	 apk add -v perl-ldap ; \
 	 apk add -v subversion ; \
-	cd /usr/local/apache2/conf/ ; \
-	sed -i'' "s/redminedbpassword/$MYSQL_PASSWORD/g" httpd.conf \
+	cd /etc/apache2/conf.d/ ; \
+	sed -i'' "s/redminedbpassword/$MYSQL_PASSWORD/g" redmine.conf \
 	;
+
+# --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 \
 		;
+#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
+
+STOPSIGNAL SIGWINCH
+
+EXPOSE 80
+
+CMD ["httpd", "-DFOREGROUND"]
diff --git a/web/httpd.conf b/web/redmine.conf
similarity index 100%
rename from web/httpd.conf
rename to web/redmine.conf