Merge pull request #344 from shanemcd/refactored-dockerfile

Refactor Dockerfile and entryoint

Reviewed-by: https://github.com/apps/ansible-zuul

Author: ansible-zuul[bot]

Dockerfile

@@ -1,34 +1,35 @@
 FROM centos:7
 
-ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini
+ADD https://github.com/krallin/tini/releases/download/v0.18.0/tini /bin/tini
+ADD utils/entrypoint.sh /bin/entrypoint
+ADD demo/project /runner/project
+ADD demo/env /runner/env
+ADD demo/inventory /runner/inventory
 
 # Install Ansible Runner
-RUN yum -y install epel-release  && \
-    yum -y install ansible python-psutil python-pip python-docutils bubblewrap bzip2 python-crypto openssh openssh-clients git && \
-    localedef -c -i en_US -f UTF-8 en_US.UTF-8 && \
-    chmod +x /tini && \
-    pip install --no-cache-dir wheel pexpect psutil python-daemon && \
-    rm -rf /var/cache/yum
+RUN yum-config-manager --add-repo https://releases.ansible.com/ansible-runner/ansible-runner.el7.repo && \
+	yum install -y epel-release && yum install -y python-pip ansible-runner bubblewrap sudo rsync && \
+	pip install --no-cache-dir ansible && \
+	localedef -c -i en_US -f UTF-8 en_US.UTF-8 && \
+	chmod +x /bin/tini /bin/entrypoint && rm -rf /var/cache/yum
 
-ENV LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8
+# In OpenShift, container will run as a random uid number and gid 0. Make sure things
+# are writeable by the root group.
+RUN mkdir -p /runner/inventory /runner/project /runner/artifacts /runner/.ansible/tmp && \
+	chmod -R g+w /runner && chgrp -R root /runner && \
+	chmod g+w /etc/passwd
 
 VOLUME /runner/inventory
 VOLUME /runner/project
 VOLUME /runner/artifacts
-ENTRYPOINT ["/tini", "--"]
-WORKDIR /
+
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 ENV RUNNER_BASE_COMMAND=ansible-playbook
-CMD /entrypoint.sh
+ENV HOME=/runner
 
-ADD utils/entrypoint.sh /entrypoint.sh
-ADD demo/project /runner/project
-ADD demo/env /runner/env
-ADD demo/inventory /runner/inventory
-ADD dist/ansible_runner-1.3.4-py2.py3-none-any.whl /ansible_runner-1.3.4-py2.py3-none-any.whl
-# In OpenShift, container will run as a random uid number and gid 0. Make sure things
-# are writeable by the root group.
-RUN chmod 755 /entrypoint.sh && chmod -R g+w /runner && chgrp -R root /runner && \
-    chmod g+w /etc/passwd && \
-    pip install --no-cache-dir /ansible_runner-1.3.4-py2.py3-none-any.whl
+WORKDIR /runner
+
+ENTRYPOINT ["entrypoint"]
+CMD ["ansible-runner", "run", "/runner"]

utils/entrypoint.sh

@@ -4,9 +4,15 @@
 # that doesn't exist in /etc/passwd, but Ansible module utils
 # require a named user. So if we're in OpenShift, we need to make
 # one before Ansible runs.
-if [ `id -u` -ge 500 ]; then
-    echo "runner:x:`id -u`:`id -g`:,,,:/runner:/bin/bash" > /tmp/passwd
-    cat /tmp/passwd >> /etc/passwd
-    rm /tmp/passwd
+if [ `id -u` -ge 500 ] || [ -z "${CURRENT_UID}" ]; then
+
+  cat << EOF > /tmp/passwd
+root:x:0:0:root:/root:/bin/bash
+runner:x:`id -u`:`id -g`:,,,:/runner:/bin/bash
+EOF
+
+  cat /tmp/passwd > /etc/passwd
+  rm /tmp/passwd
 fi
-ansible-runner run /runner
+
+exec tini -- "${@}"