Merge pull request #11 from Reposoft/httpd-svnclient

Add svn client http+https support to httpd image

Author: solsson

build-contracts/docker-compose.yml

@@ -7,14 +7,14 @@ services:
     expose:
       - "80"
 
-  svn_adminrest:
+  svn-adminrest:
     build: ../httpd
     environment:
       ADMIN_REST_ACCESS: "true"
     expose:
       - "80"
 
-  svn_authz:
+  svn-authz:
     build: ../httpd
     environment:
       ADMIN_REST_ACCESS: "true"
@@ -59,16 +59,30 @@ services:
     links:
       - rweb-httpd:svn
 
-  debian-svnclient:
-    build: ../debian-svnclient
-    image: solsson/debian-svnclient
+  svnclient:
+    build: ../svnclient
+    image: solsson/svnclient
 
   svntest:
     depends_on:
-      - debian-svnclient
+      - svnclient
     build: ./svntest
     labels:
       com.yolean.build-contract: "*"
     links:
       - svn
-      - svn_adminrest
+      - svn-adminrest
+
+  httpd-curl:
+    build: ../httpd
+    labels:
+      - com.yolean.build-contract
+    entrypoint: curl
+    command: [-I, "https://svn.apache.org/repos/asf/subversion/trunk/", "-k"]
+
+  httpd-svn-client:
+    build: ../httpd
+    labels:
+      - com.yolean.build-contract
+    entrypoint: svn
+    command: [info, "https://svn.apache.org/repos/asf/subversion/trunk/", "--trust-server-cert"]

build-contracts/svntest/Dockerfile

@@ -1,5 +1,5 @@
 
-FROM solsson/debian-svnclient
+FROM solsson/svnclient
 
 COPY . /test/
 

build-contracts/svntest/repocreate.sh

@@ -4,11 +4,11 @@ set -e
 
 [[ -z "$RETRY" ]] && RETRY="--retry 3 --retry-delay 5"
 
-curl $RETRY -f http://svn_adminrest/svn/ -I || exit 1
+curl $RETRY -f http://svn-adminrest/svn/ -I || exit 1
 
-curl $RETRY -f http://svn_adminrest/admin/repocreate -d reponame=test1 || exit 1
+curl $RETRY -f http://svn-adminrest/admin/repocreate -d reponame=test1 || exit 1
 
-curl $RETRY -f http://svn_adminrest/svn/test1/ -I || exit 1
+curl $RETRY -f http://svn-adminrest/svn/test1/ -I || exit 1
 
 #noaccess=$(curl $RETRY -f http://svn_noadminrest/admin/repocreate -I)
 #echo $noaccess

httpd/Dockerfile

@@ -8,9 +8,13 @@ ENV SVN_BZ2_SHA1 0999f5e16b146f824b952a5552826b9cb5c47b13
 
 ENV DEBIAN_FRONTEND noninteractive
 
+# we have the stretch package repo from upstream, so let's use https://packages.debian.org/stretch/ca-certificates
+ENV CA_CERTIFICATES_VERSION 20161130
+
 RUN depsRuntime=" \
 		libsqlite3-0 \
 		curl \
+		libserf-1-1 \
 	" \
 	&& depsBuild=" \
 		ca-certificates \
@@ -20,13 +24,14 @@ RUN depsRuntime=" \
 		libssl-dev=$OPENSSL_VERSION \
 		make \
 		libsqlite3-dev \
-		libz-dev \
+		zlib1g-dev \
+		libneon27-dev \
+		libserf-dev \
 	" \
 	set -x \
 	&& apt-get update \
 	&& apt-get install -y --no-install-recommends $depsRuntime \
 	&& apt-get install -y --no-install-recommends $depsBuild \
-	&& rm -r /var/lib/apt/lists/* \
 	&& curl -SL "$SVN_BZ2_URL" -o subversion-$SVN_VERSION.tar.bz2 \
 	&& echo "$SVN_BZ2_SHA1 subversion-$SVN_VERSION.tar.bz2" | sha1sum -c - \
 	&& mkdir -p src/svn \
@@ -40,6 +45,8 @@ RUN depsRuntime=" \
 	&& cd ../../ \
 	&& rm -r src/svn \
 	&& apt-get purge -y --auto-remove $depsBuild \
+	&& apt-get install -y ca-certificates=$CA_CERTIFICATES_VERSION \
+	&& rm -r /var/lib/apt/lists/* \
 	&& echo "Include conf/svn/httpd.conf" >> conf/httpd.conf
 
 COPY conf conf/svn

httpd/conf/httpd.conf

@@ -6,7 +6,7 @@ Include conf/svn/load.conf
 <IfDefine AUTHZ=inrepo>
   Include conf/svn/load-authz.conf
 </IfDefine>
-<IfDefine AUTHZ=admin>
+<IfDefine AUTHZ=admrepo>
   Include conf/svn/load-authz.conf
 </IfDefine>