Skip to content

Commit bfdc606

Browse files
committed
Merge branch 'startpage'
2 parents 2b70183 + 011a994 commit bfdc606

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

httpd/conf/httpd.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,10 @@ Include conf/svn/cgi/*.conf
4141
<IfDefine AUTHN=anon>
4242
Include conf/svn/rweb/r-hosting.conf
4343
</IfDefine>
44+
45+
RedirectMatch ^/$ /repos-web/
46+
</IfDefine>
47+
48+
<IfDefine !RWEB=fpm>
49+
RedirectMatch ^/$ /svn/
4450
</IfDefine>

rweb/fpm-svn/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.0.17-fpm
1+
FROM php:7.0.19-fpm@sha256:77d4e6b05a8ac94749234ac5c8c0f0066decd921d1d517ac295bae628946f884
22

33
# Same build concept as in httpd,
44
# but rweb should only have the svn client with http ra

rweb/fpm/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM solsson/fpm-svn
22

3-
ENV RWEB_VERSION=1.6.2
4-
ENV RWEB_TGZ_URL=https://github.com/Reposoft/rweb/archive/v$RWEB_VERSION.tar.gz
5-
ENV RWEB_TGZ_SHA1=dca1255e3a11ecae22b57dc49ea6c718d4b4c037
3+
ENV RWEB_VERSION=v1.6.4
4+
ENV RWEB_TGZ_URL=https://github.com/Reposoft/rweb/archive/$RWEB_VERSION.tar.gz
5+
ENV RWEB_TGZ_SHA1=6a8242747f271f202dff4565c9c01feb04167d6e
66

77
RUN apt-get update && apt-get install -y --no-install-recommends \
88
curl \

rweb/httpd/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ FROM solsson/svn-httpd
22

33
ENV RWEB=fpm
44

5-
ENV RWEB_VERSION=1.6.2
6-
ENV RWEB_TGZ_URL=https://github.com/Reposoft/rweb/archive/v$RWEB_VERSION.tar.gz
7-
ENV RWEB_TGZ_SHA1=dca1255e3a11ecae22b57dc49ea6c718d4b4c037
5+
ENV RWEB_VERSION=v1.6.4
6+
ENV RWEB_TGZ_URL=https://github.com/Reposoft/rweb/archive/$RWEB_VERSION.tar.gz
7+
ENV RWEB_TGZ_SHA1=6a8242747f271f202dff4565c9c01feb04167d6e
88

99
RUN echo "Downloading rweb source..." \
1010
&& curl -SLk "$RWEB_TGZ_URL" -o /usr/src/rweb-$RWEB_VERSION.tar.gz \

0 commit comments

Comments
 (0)