Fixing locale stuff in ubuntu 14.04 Dockerfile

This commit is contained in:
James Cammarata 2016-03-03 22:29:21 -05:00
parent f56af2ec3f
commit 069e597aaa
2 changed files with 3 additions and 1 deletions

View file

@ -3,6 +3,7 @@ RUN apt-get clean; apt-get update -y;
RUN apt-get install -y \
debianutils \
git \
locales \
make \
mercurial \
ruby \
@ -24,5 +25,6 @@ RUN apt-get install -y \
RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers
RUN mkdir /etc/ansible/
RUN echo -e '[local]\nlocalhost' > /etc/ansible/hosts
RUN locale-gen en_US.UTF-8
ENV container=docker
CMD ["/sbin/init"]

View file

@ -10,6 +10,6 @@ if [ "${TARGET}" = "sanity" ]; then
else
docker build -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; make tests && (cd test/integration; make)'
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})
fi