From 684f7793811b1e46a3fd70df1bdb514f76623291 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 16 Nov 2015 17:49:21 +0100 Subject: [PATCH] tests: use fedora 23 for docker images --- tests/docker-kerberos/Dockerfile-fedora-client | 4 ++-- tests/docker-kerberos/Dockerfile-fedora-kerberos | 4 ++-- tests/docker-ocserv/Dockerfile-fedora-otp | 4 ++-- tests/docker-ocserv/Dockerfile-fedora-pam | 4 ++-- tests/docker-ocserv/Dockerfile-fedora-pam-noauth | 4 ++-- tests/docker-ocserv/Dockerfile-fedora-proxyproto | 4 ++-- tests/docker-ocserv/Dockerfile-fedora-proxyproto-unix | 4 ++-- tests/docker-ocserv/Dockerfile-fedora-radius | 4 ++-- tests/docker-ocserv/Dockerfile-fedora-radius-config | 4 ++-- tests/docker-ocserv/Dockerfile-fedora-tcp | 4 ++-- tests/docker-ocserv/Dockerfile-fedora-unix | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/docker-kerberos/Dockerfile-fedora-client b/tests/docker-kerberos/Dockerfile-fedora-client index ac63cd87..6d19e004 100644 --- a/tests/docker-kerberos/Dockerfile-fedora-client +++ b/tests/docker-kerberos/Dockerfile-fedora-client @@ -1,10 +1,10 @@ # Clone from the Fedora 22 image -FROM fedora:22 +FROM fedora:23 RUN yum install -y krb5-libs krb5-workstation RUN yum install -y gnutls gnutls-utils iproute systemd RUN yum install -y bash net-tools nuttcp iputils openssh-clients passwd -RUN yum install -y lz4 liboauth oathtool procps-ng iputils +RUN yum install -y lz4 radcli liboauth oathtool procps-ng iputils RUN yum install -y openconnect # To be able to debug diff --git a/tests/docker-kerberos/Dockerfile-fedora-kerberos b/tests/docker-kerberos/Dockerfile-fedora-kerberos index 216c3240..bf6d0ece 100644 --- a/tests/docker-kerberos/Dockerfile-fedora-kerberos +++ b/tests/docker-kerberos/Dockerfile-fedora-kerberos @@ -1,11 +1,11 @@ # Clone from the Fedora 22 image -FROM fedora:22 +FROM fedora:23 RUN yum install -y krb5-libs krb5-server krb5-workstation RUN yum install -y gnutls gnutls-utils protobuf-c iproute pcllib http-parser tcp_wrappers pam systemd libseccomp RUN yum install -y bash net-tools nuttcp iputils openssh-clients RUN yum install -y libnl3 libtalloc -RUN yum install -y lz4 liboauth oathtool procps-ng iputils +RUN yum install -y lz4 radcli liboauth oathtool procps-ng iputils RUN yum install -y freeradius-client RUN yum install -y pam_krb5 diff --git a/tests/docker-ocserv/Dockerfile-fedora-otp b/tests/docker-ocserv/Dockerfile-fedora-otp index d2c1e611..ca2f51b8 100644 --- a/tests/docker-ocserv/Dockerfile-fedora-otp +++ b/tests/docker-ocserv/Dockerfile-fedora-otp @@ -1,7 +1,7 @@ -FROM fedora:22 +FROM fedora:23 RUN yum install -y gnutls gnutls-utils protobuf-c iproute pcllib http-parser tcp_wrappers pam systemd libseccomp -RUN yum install -y libnl3 libtalloc freeradius-client lz4 liboauth oathtool procps-ng iputils krb5-libs less bash openssh-server nuttcp +RUN yum install -y libnl3 libtalloc freeradius-client lz4 radcli liboauth oathtool procps-ng iputils krb5-libs less bash openssh-server nuttcp RUN systemctl enable sshd RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config diff --git a/tests/docker-ocserv/Dockerfile-fedora-pam b/tests/docker-ocserv/Dockerfile-fedora-pam index 7e61566a..0070be45 100644 --- a/tests/docker-ocserv/Dockerfile-fedora-pam +++ b/tests/docker-ocserv/Dockerfile-fedora-pam @@ -1,9 +1,9 @@ -FROM fedora:22 +FROM fedora:23 RUN yum install -y gnutls gnutls-utils protobuf-c iproute pcllib http-parser tcp_wrappers pam systemd libseccomp RUN yum install -y bash openssh-server nuttcp RUN yum install -y libnl3 libtalloc -RUN yum install -y lz4 liboauth oathtool procps-ng iputils +RUN yum install -y lz4 radcli liboauth oathtool procps-ng iputils RUN yum install -y pam RUN yum install -y freeradius-client RUN yum install -y krb5-libs diff --git a/tests/docker-ocserv/Dockerfile-fedora-pam-noauth b/tests/docker-ocserv/Dockerfile-fedora-pam-noauth index da1190ba..25c69262 100644 --- a/tests/docker-ocserv/Dockerfile-fedora-pam-noauth +++ b/tests/docker-ocserv/Dockerfile-fedora-pam-noauth @@ -1,9 +1,9 @@ -FROM fedora:22 +FROM fedora:23 RUN yum install -y gnutls gnutls-utils protobuf-c iproute pcllib http-parser tcp_wrappers pam systemd libseccomp RUN yum install -y bash openssh-server nuttcp RUN yum install -y libnl3 libtalloc -RUN yum install -y lz4 liboauth oathtool procps-ng iputils +RUN yum install -y lz4 radcli liboauth oathtool procps-ng iputils RUN yum install -y pam RUN yum install -y freeradius-client RUN yum install -y krb5-libs diff --git a/tests/docker-ocserv/Dockerfile-fedora-proxyproto b/tests/docker-ocserv/Dockerfile-fedora-proxyproto index 348b9ead..0e8ba42d 100644 --- a/tests/docker-ocserv/Dockerfile-fedora-proxyproto +++ b/tests/docker-ocserv/Dockerfile-fedora-proxyproto @@ -1,11 +1,11 @@ -FROM fedora:22 +FROM fedora:23 RUN yum install -y gnutls gnutls-utils protobuf-c iproute pcllib http-parser tcp_wrappers pam systemd libseccomp RUN yum install -y bash openssh-server nuttcp RUN systemctl enable sshd RUN yum install -y libnl3 libtalloc haproxy RUN yum install -y freeradius-client -RUN yum install -y lz4 liboauth oathtool procps-ng iputils +RUN yum install -y lz4 radcli liboauth oathtool procps-ng iputils RUN yum install -y krb5-libs less RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config diff --git a/tests/docker-ocserv/Dockerfile-fedora-proxyproto-unix b/tests/docker-ocserv/Dockerfile-fedora-proxyproto-unix index 106ceb8a..9da4d2ff 100644 --- a/tests/docker-ocserv/Dockerfile-fedora-proxyproto-unix +++ b/tests/docker-ocserv/Dockerfile-fedora-proxyproto-unix @@ -1,11 +1,11 @@ -FROM fedora:22 +FROM fedora:23 RUN yum install -y gnutls gnutls-utils protobuf-c iproute pcllib http-parser tcp_wrappers pam systemd libseccomp RUN yum install -y bash openssh-server nuttcp RUN systemctl enable sshd RUN yum install -y libnl3 libtalloc haproxy RUN yum install -y freeradius-client -RUN yum install -y lz4 liboauth oathtool procps-ng iputils +RUN yum install -y lz4 radcli liboauth oathtool procps-ng iputils RUN yum install -y krb5-libs less RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config diff --git a/tests/docker-ocserv/Dockerfile-fedora-radius b/tests/docker-ocserv/Dockerfile-fedora-radius index 7fd55f45..d1fb904a 100644 --- a/tests/docker-ocserv/Dockerfile-fedora-radius +++ b/tests/docker-ocserv/Dockerfile-fedora-radius @@ -1,9 +1,9 @@ -FROM fedora:22 +FROM fedora:23 RUN yum install -y gnutls gnutls-utils protobuf-c iproute pcllib http-parser tcp_wrappers pam systemd libseccomp RUN yum install -y bash openssh-server nuttcp RUN yum install -y libnl3 libtalloc -RUN yum install -y lz4 liboauth oathtool +RUN yum install -y lz4 radcli liboauth oathtool RUN yum install -y freeradius-client RUN yum install -y freeradius RUN yum install -y krb5-libs less diff --git a/tests/docker-ocserv/Dockerfile-fedora-radius-config b/tests/docker-ocserv/Dockerfile-fedora-radius-config index 853ce83a..f9417750 100644 --- a/tests/docker-ocserv/Dockerfile-fedora-radius-config +++ b/tests/docker-ocserv/Dockerfile-fedora-radius-config @@ -1,9 +1,9 @@ -FROM fedora:22 +FROM fedora:23 RUN yum install -y gnutls gnutls-utils protobuf-c iproute pcllib http-parser tcp_wrappers pam systemd libseccomp RUN yum install -y bash openssh-server nuttcp RUN yum install -y libnl3 libtalloc -RUN yum install -y lz4 liboauth oathtool +RUN yum install -y lz4 radcli liboauth oathtool RUN yum install -y freeradius-client RUN yum install -y freeradius less RUN systemctl enable sshd diff --git a/tests/docker-ocserv/Dockerfile-fedora-tcp b/tests/docker-ocserv/Dockerfile-fedora-tcp index 6fc8daa8..7a56bfc4 100644 --- a/tests/docker-ocserv/Dockerfile-fedora-tcp +++ b/tests/docker-ocserv/Dockerfile-fedora-tcp @@ -1,10 +1,10 @@ -FROM fedora:22 +FROM fedora:23 RUN yum install -y gnutls gnutls-utils protobuf-c iproute pcllib http-parser tcp_wrappers pam systemd libseccomp RUN yum install -y bash openssh-server nuttcp RUN yum install -y libnl3 libtalloc RUN yum install -y freeradius-client -RUN yum install -y lz4 liboauth oathtool procps-ng iputils +RUN yum install -y lz4 radcli liboauth oathtool procps-ng iputils RUN yum install -y krb5-libs less RUN systemctl enable sshd RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config diff --git a/tests/docker-ocserv/Dockerfile-fedora-unix b/tests/docker-ocserv/Dockerfile-fedora-unix index e1ccf54e..b7fd3311 100644 --- a/tests/docker-ocserv/Dockerfile-fedora-unix +++ b/tests/docker-ocserv/Dockerfile-fedora-unix @@ -1,11 +1,11 @@ -FROM fedora:22 +FROM fedora:23 RUN yum install -y gnutls gnutls-utils protobuf-c iproute pcllib http-parser tcp_wrappers pam systemd libseccomp RUN yum install -y bash openssh-server nuttcp RUN systemctl enable sshd RUN yum install -y libnl3 libtalloc haproxy RUN yum install -y freeradius-client -RUN yum install -y lz4 liboauth oathtool procps-ng iputils +RUN yum install -y lz4 radcli liboauth oathtool procps-ng iputils RUN yum install -y krb5-libs less RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config