Skip to content

Commit 9915452

Browse files
authored
Fix Apache segfault (elleFlorio#17)
1 parent 0e0b44a commit 9915452

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Alpine Linux with s6 service management
2-
FROM smebberson/alpine-base
2+
FROM smebberson/alpine-base:3.2.0
33

44
# Install Apache2 and other stuff needed to access svn via WebDav
55
# Install svn
66
# Installing utilities for SVNADMIN frontend
77
# Create required folders
88
# Create the authentication file for http access
99
# Getting SVNADMIN interface
10-
RUN apk add --no-cache apache2 apache2-ctl apache2-utils apache2-webdav mod_dav_svn &&\
10+
RUN apk add --no-cache apache2 apache2-utils apache2-webdav mod_dav_svn &&\
1111
apk add --no-cache subversion &&\
1212
apk add --no-cache wget unzip php7 php7-apache2 php7-session php7-json php7-ldap &&\
1313
apk add --no-cache php7-xml &&\
@@ -23,6 +23,9 @@ RUN apk add --no-cache apache2 apache2-ctl apache2-utils apache2-webdav mod_dav_
2323
ln -s /opt/svnadmin /var/www/localhost/htdocs/svnadmin &&\
2424
chmod -R 777 /opt/svnadmin/data
2525

26+
# Solve a sicurity issue (https://alpinelinux.org/posts/Docker-image-vulnerability-CVE-2019-5021.html)
27+
RUN sed -i -e 's/^root::/root:!:/' /etc/shadow
28+
2629
# Fixing https://github.com/mfreiholz/iF.SVNAdmin/issues/118
2730
ADD svnadmin/classes/util/global.func.php /opt/svnadmin/classes/util/global.func.php
2831

0 commit comments

Comments
 (0)