From 6830411a84bdd6d66b6582287c86ca6f11b20ffa Mon Sep 17 00:00:00 2001 From: solsson Date: Tue, 12 Jan 2016 08:45:00 +0100 Subject: [PATCH 1/3] Adds curl, useful when inside the container --- httpd/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/httpd/Dockerfile b/httpd/Dockerfile index cfc4aff..817938f 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -33,6 +33,7 @@ RUN buildDeps=' \ && /sbin/ldconfig \ && cd ../../ \ && rm -r src/svn \ + && apt-get install curl \ # useful, not necessary && apt-get purge -y --auto-remove $buildDeps \ && echo "Include conf/svn/httpd.conf" >> conf/httpd.conf From 490ded53796c6029976768b89c08d1a5e746d7c0 Mon Sep 17 00:00:00 2001 From: solsson Date: Tue, 12 Jan 2016 08:44:03 +0100 Subject: [PATCH 2/3] configure: error: Serf was explicitly enabled but an appropriate version was not found --- httpd/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/httpd/Dockerfile b/httpd/Dockerfile index 817938f..264e399 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -15,10 +15,11 @@ RUN buildDeps=' \ make \ libsqlite3-dev \ libz-dev \ + libserf-dev \ ' \ set -x \ && apt-get update \ - && apt-get install -y --no-install-recommends libsqlite3-0 \ + && apt-get install -y --no-install-recommends libsqlite3-0 libserf-1-1 \ && apt-get install -y --no-install-recommends $buildDeps \ && rm -r /var/lib/apt/lists/* \ && curl -SL "$SVN_BZ2_URL" -o subversion-$SVN_VERSION.tar.bz2 \ @@ -27,7 +28,7 @@ RUN buildDeps=' \ && tar -xvf subversion-$SVN_VERSION.tar.bz2 -C src/svn --strip-components=1 \ && rm subversion-$SVN_VERSION.tar.bz2* \ && cd src/svn \ - && ./configure \ + && ./configure --with-serf \ && make -j"$(nproc)" \ && make install \ && /sbin/ldconfig \ From a51a5804af817bb56ab76e8c9318c044e9b20e62 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 15 Apr 2016 06:09:54 +0200 Subject: [PATCH 3/3] The trick learned from rweb, add neon so svn finds serf --- httpd/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/httpd/Dockerfile b/httpd/Dockerfile index 264e399..217f56a 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -16,10 +16,11 @@ RUN buildDeps=' \ libsqlite3-dev \ libz-dev \ libserf-dev \ + libneon27-dev \ ' \ set -x \ && apt-get update \ - && apt-get install -y --no-install-recommends libsqlite3-0 libserf-1-1 \ + && apt-get install -y --no-install-recommends libsqlite3-0 libserf-1-1 libneon27 \ && apt-get install -y --no-install-recommends $buildDeps \ && rm -r /var/lib/apt/lists/* \ && curl -SL "$SVN_BZ2_URL" -o subversion-$SVN_VERSION.tar.bz2 \