mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Another attempt at fixing random f23 locale failures in docker image
This commit is contained in:
parent
5aab158987
commit
0e17a6f036
2 changed files with 3 additions and 3 deletions
|
@ -37,8 +37,8 @@ RUN dnf -y install \
|
|||
unzip \
|
||||
which \
|
||||
yum
|
||||
RUN localedef -f ISO-8859-1 -i pt_BR pt_BR
|
||||
RUN localedef -f ISO-8859-1 -i es_MX es_MX
|
||||
RUN localedef -q -f ISO-8859-1 -i pt_BR pt_BR
|
||||
RUN localedef -q -f ISO-8859-1 -i es_MX es_MX
|
||||
RUN /usr/bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers
|
||||
RUN mkdir /etc/ansible/
|
||||
RUN /usr/bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
|
||||
|
|
|
@ -8,7 +8,7 @@ if [ "${TARGET}" = "sanity" ]; then
|
|||
if test x"$TOXENV" != x'py24' ; then tox ; fi
|
||||
if test x"$TOXENV" = x'py24' ; then python2.4 -V && python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils ; fi
|
||||
else
|
||||
docker build -t ansible_test/${TARGET} test/utils/docker/${TARGET}
|
||||
docker build --pull=true -t ansible_test/${TARGET} test/utils/docker/${TARGET}
|
||||
docker run -d --volume="${PWD}:/root/ansible" ${TARGET_OPTIONS} ansible_test/${TARGET} > /tmp/cid_${TARGET}
|
||||
docker exec -ti $(cat /tmp/cid_${TARGET}) /bin/sh -c 'cd /root/ansible; . hacking/env-setup; (cd test/integration; LC_ALL=en_US.utf-8 make)'
|
||||
docker kill $(cat /tmp/cid_${TARGET})
|
||||
|
|
Loading…
Reference in a new issue