Skip to content

Commit 8d46049

Browse files
add xmlsec flag to docker installs
1 parent 4b27b05 commit 8d46049

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

installer/image_build/templates/Dockerfile.j2

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ RUN yum -y install epel-release && \
3434
yum -y update && \
3535
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 && \
3636
pip install virtualenv supervisor && \
37+
CFLAGS="-DXMLSEC_NO_SIZE_T" \
3738
VENV_BASE=/var/lib/awx/venv make requirements_ansible && \
3839
VENV_BASE=/var/lib/awx/venv make requirements_awx && \
3940
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 && \

requirements/requirements.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ python-dateutil==2.7.0 # contains support for TZINFO= parsing
4242
python-logstash==0.4.6
4343
python-memcached==1.59
4444
python-radius==1.0
45-
python-saml==2.2.2 # pinned due to open issue awx/issues/1421
45+
python-saml==2.4.0
4646
social-auth-core==1.7.0
4747
social-auth-app-django==2.1.0
4848
pyvmomi==6.5

requirements/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ python-logstash==0.4.6
188188
python-memcached==1.59
189189
python-openid==2.2.5 # via social-auth-core
190190
python-radius==1.0
191-
python-saml==2.2.2
191+
python-saml==2.4.0
192192
pytz==2018.3 # via celery, django, irc, tempora, twilio
193193
pyvmomi==6.5
194194
pyyaml==3.12 # via djangorestframework-yaml, openstacksdk, os-client-config, psphere

tools/docker-compose/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN ln -s /awx_devel/tools/docker-compose/bootstrap_development.sh /bootstrap_de
2929
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"
3030
RUN openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/nginx.key -out /etc/nginx/nginx.crt
3131
WORKDIR /tmp
32-
RUN SWIG_FEATURES="-cpperraswarn -includeall -D__`uname -m`__ -I/usr/include/openssl" VENV_BASE="/venv" make requirements_dev
32+
RUN CFLAGS="-DXMLSEC_NO_SIZE_T" SWIG_FEATURES="-cpperraswarn -includeall -D__`uname -m`__ -I/usr/include/openssl" VENV_BASE="/venv" make requirements_dev
3333
RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
3434
ENV LANG en_US.UTF-8
3535
ENV LANGUAGE en_US:en

0 commit comments

Comments
 (0)