From 518d8679d13c0721271b8f0665408052e9281685 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sun, 1 Nov 2015 17:31:43 +0100 Subject: [PATCH] tests: use debian:testing for tests --- tests/docker-ocserv/Dockerfile-debian-proxyproto | 6 +++--- tests/docker-ocserv/Dockerfile-debian-radius | 10 ++++------ tests/docker-ocserv/Dockerfile-debian-radius-config | 10 ++++------ tests/docker-ocserv/Dockerfile-debian-tcp | 11 ++++------- tests/docker-ocserv/Dockerfile-debian-unix | 10 +++------- 5 files changed, 18 insertions(+), 29 deletions(-) diff --git a/tests/docker-ocserv/Dockerfile-debian-proxyproto b/tests/docker-ocserv/Dockerfile-debian-proxyproto index e7ee2bc5..7748eb34 100644 --- a/tests/docker-ocserv/Dockerfile-debian-proxyproto +++ b/tests/docker-ocserv/Dockerfile-debian-proxyproto @@ -1,10 +1,10 @@ -FROM debian:jessie +FROM debian:testing RUN apt-get update RUN apt-get install -y libgnutls-deb0-28 libprotobuf-c1 liboath0 RUN apt-get install -y libwrap0 libpam0g libseccomp2 libdbus-1-3 libreadline5 libnl-route-3-200 -RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 autogen -RUN apt-get install -y libsystemd-daemon0 valgrind nuttcp openssh-server bash +RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 +RUN apt-get install -y libsystemd0 valgrind nuttcp openssh-server bash RUN apt-get install -y libtalloc2 liblz4-1 libkrb5-3 less haproxy RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config diff --git a/tests/docker-ocserv/Dockerfile-debian-radius b/tests/docker-ocserv/Dockerfile-debian-radius index 2f4a13f2..8265d010 100644 --- a/tests/docker-ocserv/Dockerfile-debian-radius +++ b/tests/docker-ocserv/Dockerfile-debian-radius @@ -1,13 +1,11 @@ -FROM debian:jessie +FROM debian:testing RUN apt-get update RUN apt-get install -y libgnutls-deb0-28 libprotobuf-c1 liboath0 RUN apt-get install -y libwrap0 libpam0g libseccomp2 libdbus-1-3 libreadline5 libnl-route-3-200 -RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 autogen -RUN apt-get install -y libsystemd-daemon0 valgrind nuttcp openssh-server bash -RUN apt-get install -y libtalloc2 -RUN apt-get install -y liblz4-1 -RUN apt-get install -y freeradius libfreeradius-client2=1.1.7 +RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 +RUN apt-get install -y libsystemd0 valgrind nuttcp openssh-server bash +RUN apt-get install -y libtalloc2 liblz4-1 freeradius libfreeradius-client2=1.1.7 RUN apt-get install -y libkrb5-3 less RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config diff --git a/tests/docker-ocserv/Dockerfile-debian-radius-config b/tests/docker-ocserv/Dockerfile-debian-radius-config index 6d6ba698..7466c614 100644 --- a/tests/docker-ocserv/Dockerfile-debian-radius-config +++ b/tests/docker-ocserv/Dockerfile-debian-radius-config @@ -1,14 +1,12 @@ -FROM debian:jessie +FROM debian:testing RUN apt-get update RUN apt-get install -y libgnutls-deb0-28 liboath0 libprotobuf-c1 RUN apt-get install -y libwrap0 libpam0g libseccomp2 libdbus-1-3 libreadline5 libnl-route-3-200 -RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 autogen -RUN apt-get install -y libsystemd-daemon0 valgrind nuttcp openssh-server bash -RUN apt-get install -y libtalloc2 -RUN apt-get install -y liblz4-1 +RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 +RUN apt-get install -y libsystemd0 valgrind nuttcp openssh-server bash +RUN apt-get install -y libtalloc2 liblz4-1 less RUN apt-get install -y freeradius libfreeradius-client2=1.1.7 -RUN apt-get install -y less RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config RUN echo 'root:root' |chpasswd diff --git a/tests/docker-ocserv/Dockerfile-debian-tcp b/tests/docker-ocserv/Dockerfile-debian-tcp index 1af0d7bf..1c25024b 100644 --- a/tests/docker-ocserv/Dockerfile-debian-tcp +++ b/tests/docker-ocserv/Dockerfile-debian-tcp @@ -1,14 +1,11 @@ -FROM debian:jessie +FROM debian:testing RUN apt-get update RUN apt-get install -y libgnutls-deb0-28 libprotobuf-c1 liboath0 RUN apt-get install -y libwrap0 libpam0g libseccomp2 libdbus-1-3 libreadline5 libnl-route-3-200 -RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 autogen -RUN apt-get install -y libsystemd-daemon0 valgrind nuttcp openssh-server bash -RUN apt-get install -y libtalloc2 -RUN apt-get install -y liblz4-1 -RUN apt-get install -y libfreeradius-client2 -RUN apt-get install -y libkrb5-3 less +RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 +RUN apt-get install -y libsystemd0 valgrind nuttcp openssh-server bash +RUN apt-get install -y libtalloc2 liblz4-1 libfreeradius-client2 libkrb5-3 less RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config RUN echo 'root:root' |chpasswd diff --git a/tests/docker-ocserv/Dockerfile-debian-unix b/tests/docker-ocserv/Dockerfile-debian-unix index 3fe77e4e..c47c923d 100644 --- a/tests/docker-ocserv/Dockerfile-debian-unix +++ b/tests/docker-ocserv/Dockerfile-debian-unix @@ -1,15 +1,11 @@ -FROM debian:jessie +FROM debian:testing RUN apt-get update RUN apt-get install -y haproxy libgnutls-deb0-28 libprotobuf-c1 liboath0 RUN apt-get install -y libwrap0 libpam0g libseccomp2 libdbus-1-3 libreadline5 libnl-route-3-200 RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 autogen -RUN apt-get install -y libsystemd-daemon0 valgrind nuttcp openssh-server bash -RUN apt-get install -y libtalloc2 -RUN apt-get install -y libfreeradius-client2 -RUN apt-get install -y libkrb5-3 less -RUN apt-get install -y less -RUN apt-get install -y liblz4-1 +RUN apt-get install -y libsystemd0 valgrind nuttcp openssh-server bash +RUN apt-get install -y libtalloc2 libfreeradius-client2 libkrb5-3 less liblz4-1 RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config RUN echo 'root:root' |chpasswd