shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity

Merge pull request #1093 from rooftopcellist/upgrade_python_saml

Browse Source 
upgrade python-saml for CVE fix
This commit is contained in:
Shane McDonald 2018-03-21 12:27:35 -04:00 committed by GitHub
commit f8b5318206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/requirements.in
View File

@ -40,7 +40,7 @@ pyparsing==2.2.0
python-logstash==0.4.6 python-logstash==0.4.6
python-memcached==1.58 python-memcached==1.58
python-radius==1.0 python-radius==1.0
python-saml==2.2.1 python-saml==2.2.4
python-social-auth==0.2.21 python-social-auth==0.2.21
pyvmomi==6.5 pyvmomi==6.5
redbaron==0.6.3 redbaron==0.6.3

2
requirements/requirements.txt
View File

@ -151,7 +151,7 @@ python-novaclient==9.0.1 # via python-openstackclient, shade
python-openid==2.2.5 # via python-social-auth python-openid==2.2.5 # via python-social-auth
python-openstackclient==3.11.0 # via python-ironicclient python-openstackclient==3.11.0 # via python-ironicclient
python-radius==1.0 python-radius==1.0
python-saml==2.2.1 python-saml==2.2.4
python-social-auth==0.2.21 python-social-auth==0.2.21
pytz==2017.2 # via babel, celery, irc, oslo.serialization, oslo.utils, tempora, twilio pytz==2017.2 # via babel, celery, irc, oslo.serialization, oslo.utils, tempora, twilio
pyvmomi==6.5 pyvmomi==6.5

2
tools/docker-compose/Dockerfile
View File

@ -30,7 +30,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 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 RUN openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/nginx.key -out /etc/nginx/nginx.crt
WORKDIR /tmp 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 RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en