diff --git a/tools/docker-compose/unit-tests/Dockerfile b/tools/docker-compose/unit-tests/Dockerfile index d1fec4e583..2de3715f7b 100644 --- a/tools/docker-compose/unit-tests/Dockerfile +++ b/tools/docker-compose/unit-tests/Dockerfile @@ -1,26 +1,11 @@ FROM gcr.io/ansible-tower-engineering/tower_devel:latest +# For UI tests RUN yum install -y bzip2 gcc-c++ -# We need to install dependencies somewhere other than /ansible-tower. -# Anything in /ansible-tower will be overwritten by the bind-mount. -# We switch the WORKDIR to /ansible-tower further down. -WORKDIR "/tmp/" - -COPY awx/ui/package.json awx/ui/ - RUN npm set progress=false -# Copy __init__.py so the Makefile can retrieve `awx.__version__` -COPY awx/__init__.py awx/ -RUN make ui-deps - WORKDIR "/tower_devel" -# This entrypoint script takes care of moving the node_modules -# into the bind-mount, then exec's to whatever was passed as the CMD. -ADD tools/docker-compose/unit-tests/entrypoint /usr/bin/ -RUN chmod +x /usr/bin/entrypoint - -ENTRYPOINT ["entrypoint"] +ENTRYPOINT ["/bin/bash", "-c"] CMD ["bash"] diff --git a/tools/docker-compose/unit-tests/entrypoint b/tools/docker-compose/unit-tests/entrypoint deleted file mode 100644 index cb7fbe142e..0000000000 --- a/tools/docker-compose/unit-tests/entrypoint +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e - -mkdir -p /tower_devel/awx/ui/ -mv -n /tmp/awx/ui/node_modules /tmp/awx/ui/.deps_built /tower_devel/awx/ui - -exec $@