Skip to content

Add svn client http+https support to httpd image #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 25, 2017
Merged

Add svn client http+https support to httpd image #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3dc653f
Fixes outdated build references
solsson Mar 25, 2017
438a412
Demonstrates that svn in httpd gets: Unrecognized URL scheme for 'https
solsson Mar 25, 2017
6b59173
Fixes svn client http/https support, though no server certs are trust…
solsson Mar 25, 2017
4de0caf
Installs the most recent ca-certificates (into /etc/ssl/certs) but cu…
solsson Mar 25, 2017
1aa3ed4
Trust any cert during tests
solsson Mar 25, 2017
c13dd55
Removes ca-certificates runtime deps as it doesn't help neither curl …
solsson Mar 25, 2017
681bc32
Fixes a test failure caused by AUTHZ option inconsistency
solsson Mar 25, 2017
30fd074
Svntest gets statsu 400 Bad Request on /svn/, but the same request fr…
solsson Mar 25, 2017
98ea893
Switches from libz-dev to zlib1g-dev because the httpd image build us…
solsson Mar 25, 2017
ede7992
LogLevel debug revealed that status 400 was caused by: Client sent ma…
solsson Mar 25, 2017
2916a95
If you install ca-certificates in a running container you get server …
solsson Mar 25, 2017
6dde902
Fixes server cert validation by installing ca-certificates after svn …
solsson Mar 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions build-contracts/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion build-contracts/svntest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM solsson/debian-svnclient
FROM solsson/svnclient

COPY . /test/

Expand Down
6 changes: 3 additions & 3 deletions build-contracts/svntest/repocreate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions httpd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion httpd/conf/httpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down