From 699b9bc548b8828f5bc620f854ac56d808b08099 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Jan 08 2019 22:04:40 +0000 Subject: Add python3 dependencies on Fedora Signed-off-by: Patrick Uiterwijk --- diff --git a/Makefile b/Makefile index 0b54d37..f702692 100644 --- a/Makefile +++ b/Makefile @@ -139,21 +139,22 @@ quickrun: container-quickrun # Testing within containers container-centos6: @echo "Building CentOS 6 container ..." - @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-centos tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/centos:6/' | docker build -f - -q -t ipsilon-centos6 - && echo "CentOS 6 container built" || echo "CentOS 6 container build failed (optional)" + @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-centos tests/containers/Dockerfile-rpm tests/containers/Dockerfile-rpm-py2; echo "USER testuser") | sed -e 's/BASE/centos:6/' | docker build -f - -q -t ipsilon-centos6 - && echo "CentOS 6 container built" || echo "CentOS 6 container build failed (optional)" container-centos7: @echo "Building CentOS 7 container ..." - @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-centos tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/centos:7/' | docker build -f - -q -t ipsilon-centos7 - + @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-centos tests/containers/Dockerfile-rpm tests/containers/Dockerfile-rpm-py2; echo "USER testuser") | sed -e 's/BASE/centos:7/' | docker build -f - -q -t ipsilon-centos7 - @echo "CentOS 7 container built" container-fedora28: @echo "Building Fedora 28 container ..." - @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:28/' | docker build -f - -q -t ipsilon-fedora28 - + # Fedora 28 is missing python3-lasso. When this gets bumped, use py3 + @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm tests/containers/Dockerfile-rpm-py2; echo "USER testuser") | sed -e 's/BASE/fedora:28/' | docker build -f - -q -t ipsilon-fedora28 - @echo "Fedora 28 container built" container-fedora29: @echo "Building Fedora 29 container ..." - @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:29/' | docker build -f - -q -t ipsilon-fedora29 - + @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm tests/containers/Dockerfile-rpm-py3; echo "USER testuser") | sed -e 's/BASE/fedora:29/' | docker build -f - -q -t ipsilon-fedora29 - @echo "Fedora 29 container built" containers: container-centos6 container-centos7 container-fedora28 container-fedora29 diff --git a/tests/containers/Dockerfile-fedora b/tests/containers/Dockerfile-fedora index 599a4f3..6d3e3ff 100644 --- a/tests/containers/Dockerfile-fedora +++ b/tests/containers/Dockerfile-fedora @@ -1 +1 @@ -RUN yum install -y etcd python2-python-etcd dbus-python python2-ipalib bandit +RUN yum install -y etcd python3-python-etcd dbus-python python3-ipalib bandit diff --git a/tests/containers/Dockerfile-rpm b/tests/containers/Dockerfile-rpm index 0ea3c69..abda712 100644 --- a/tests/containers/Dockerfile-rpm +++ b/tests/containers/Dockerfile-rpm @@ -1,13 +1,8 @@ RUN yum update -y \ && yum install -y which # This should be kept in sync with the develop page on the website. -# Distro-specific packages should go in the distro sub-dockerfiles. -RUN yum install -y make python2-pylint python-pep8 python-openid python-openid-teams \ - python-openid-cla python-cherrypy m2crypto lasso-python \ - python-sqlalchemy python-ldap python-pam python-fedora \ - freeipa-python httpd mod_auth_mellon postgresql-server \ - openssl mod_wsgi python-jinja2 python-psycopg2 sssd \ - libsss_simpleifp openldap-servers mod_auth_gssapi krb5-server \ - socket_wrapper nss_wrapper python-requests-kerberos python-lesscpy\ - nodejs-less krb5-workstation python-sssdconfig sqlite python-jwcrypto \ - mod_ssl mod_auth_openidc python-jwcrypto python-six +# Distro-specific and python packages should go in the distro sub-dockerfiles. +RUN yum install -y make httpd mod_auth_mellon postgresql-server \ + openssl sssd libsss_simpleifp openldap-servers mod_auth_gssapi \ + krb5-server socket_wrapper nss_wrapper nodejs-less krb5-workstation \ + sqlite mod_ssl mod_auth_openidc diff --git a/tests/containers/Dockerfile-rpm-py2 b/tests/containers/Dockerfile-rpm-py2 new file mode 100644 index 0000000..8acc0a5 --- /dev/null +++ b/tests/containers/Dockerfile-rpm-py2 @@ -0,0 +1,6 @@ +RUN yum install -y python2-pylint python-pep8 python-openid python-openid-teams \ + python-openid-cla python-cherrypy m2crypto lasso-python \ + python-sqlalchemy python-ldap python-pam python-fedora \ + mod_wsgi python-jinja2 python-psycopg2 \ + python-requests-kerberos python-lesscpy python-sssdconfig \ + python-jwcrypto python-jwcrypto python-six diff --git a/tests/containers/Dockerfile-rpm-py3 b/tests/containers/Dockerfile-rpm-py3 new file mode 100644 index 0000000..3b0e42d --- /dev/null +++ b/tests/containers/Dockerfile-rpm-py3 @@ -0,0 +1,7 @@ +RUN yum install -y python3-pylint python3-pep8 python3-openid python3-openid-teams \ + python3-openid-cla python3-cherrypy python3-m2crypto python3-lasso \ + python3-sqlalchemy python3-ldap python3-pam python3-fedora \ + python3-ipalib python3-mod_wsgi python3-jinja2 python3-psycopg2 \ + python3-requests-kerberos python3-lesscpy python3-sssdconfig \ + python3-jwcrypto python3-jwcrypto python3-six +RUN yum erase -y python2