External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity

add xmlsec flag to docker installs

Browse Source
This commit is contained in:
adamscmRH 2018-03-14 12:50:21 -04:00
parent 4b27b05fd2
commit 8d460490c1
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
installer/image_build/templates/Dockerfile.j2
View File

@ -34,6 +34,7 @@ RUN yum -y install epel-release && \
yum -y update && \
yum -y install ansible git2u-core mercurial subversion curl python-psycopg2 python-pip python-setuptools libselinux-python setools-libs yum-utils sudo acl make postgresql-devel nginx python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap gcc-c++ python-devel krb5-workstation krb5-libs python-crypto libcurl-devel rsync && \
pip install virtualenv supervisor && \
CFLAGS="-DXMLSEC_NO_SIZE_T" \
VENV_BASE=/var/lib/awx/venv make requirements_ansible && \
VENV_BASE=/var/lib/awx/venv make requirements_awx && \
yum -y remove gcc postgresql-devel libxml2-devel libxslt-devel cyrus-sasl-devel openldap-devel xmlsec1-devel krb5-devel xmlsec1-openssl-devel libtool-ltdl-devel gcc-c++ python-devel && \

2
requirements/requirements.in
View File

@ -42,7 +42,7 @@ python-dateutil==2.7.0 # contains support for TZINFO= parsing
python-logstash==0.4.6
python-memcached==1.59
python-radius==1.0
python-saml==2.2.2 # pinned due to open issue awx/issues/1421
python-saml==2.4.0
social-auth-core==1.7.0
social-auth-app-django==2.1.0
pyvmomi==6.5

2
requirements/requirements.txt
View File

@ -188,7 +188,7 @@ python-logstash==0.4.6
python-memcached==1.59
python-openid==2.2.5 # via social-auth-core
python-radius==1.0
python-saml==2.2.2
python-saml==2.4.0
pytz==2018.3 # via celery, django, irc, tempora, twilio
pyvmomi==6.5
pyyaml==3.12 # via djangorestframework-yaml, openstacksdk, os-client-config, psphere

2
tools/docker-compose/Dockerfile
View File

@ -29,7 +29,7 @@ RUN ln -s /awx_devel/tools/docker-compose/bootstrap_development.sh /bootstrap_de
RUN openssl req -nodes -newkey rsa:2048 -keyout /etc/nginx/nginx.key -out /etc/nginx/nginx.csr -subj "/C=US/ST=North Carolina/L=Durham/O=Ansible/OU=AWX Development/CN=awx.localhost"
RUN openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/nginx.key -out /etc/nginx/nginx.crt
WORKDIR /tmp
RUN SWIG_FEATURES="-cpperraswarn -includeall -D__`uname -m`__ -I/usr/include/openssl" VENV_BASE="/venv" make requirements_dev
RUN CFLAGS="-DXMLSEC_NO_SIZE_T" SWIG_FEATURES="-cpperraswarn -includeall -D__`uname -m`__ -I/usr/include/openssl" VENV_BASE="/venv" make requirements_dev
RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en