Bring isolated dev env current

There was quite a bit of drift between the main Dockerfile and this one since we last touched it. It’s heavier than it needs to be, but by using the main development image as the base here, we have less duplicated and outdated code overall.

1 files changed, 8 insertions, 22 deletions

diff --git a/tools/docker-isolated/Dockerfile b/tools/docker-isolated/Dockerfile
index f99076b671..e3d78b732d 100644
--- a/tools/docker-isolated/Dockerfile
+++ b/tools/docker-isolated/Dockerfile
@@ -1,23 +1,9 @@
-FROM centos:7
-RUN yum clean all
+ARG TAG=latest
+FROM ansible/awx_devel:${TAG}
 
-ADD Makefile /tmp/Makefile
-RUN mkdir /tmp/requirements
-ADD requirements/requirements_ansible.txt requirements/requirements_ansible_git.txt requirements/requirements_ansible_uninstall.txt /tmp/requirements/
-RUN yum -y update && yum -y install curl epel-release
-RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git python-devel python36 python36-devel python-psycopg2 make python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap zanata-python-client gettext gcc-c++ libcurl-devel python-pycurl bzip2
-
-RUN python3 -m ensurepip
-RUN pip3 install virtualenv
-RUN pip3 install ansible-runner
-WORKDIR /tmp
-RUN make requirements_ansible
-RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-WORKDIR /
-EXPOSE 22
+RUN yum install -y gcc python36-devel
+RUN python3 -m ensurepip && pip3 install virtualenv ansible-runner
+RUN yum remove -y gcc python36-devel && rm -rf /var/cache/yum
 
 RUN rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_rsa_key
 RUN ssh-keygen -q -N "" -t dsa -f /etc/ssh/ssh_host_ecdsa_key
@@ -28,7 +14,7 @@ RUN sed -i "s/#StrictModes.*/StrictModes no/g" /etc/ssh/sshd_config
 RUN mkdir -p /root/.ssh
 RUN ln -s /awx_devel/authorized_keys /root/.ssh/authorized_keys
 
-ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini
-RUN chmod +x /tini
-ENTRYPOINT ["/tini", "--"]
+ENTRYPOINT ["tini", "--"]
 CMD ["/usr/sbin/sshd", "-D"]
+
+EXPOSE 22