From ff8966dd4891740f1b37ee94247860a854c8c393 Mon Sep 17 00:00:00 2001 From: James Laska Date: Wed, 19 Oct 2016 12:35:59 -0400 Subject: [PATCH] Update unittest container to build ui-deps --- Makefile | 5 ++++- tools/docker-compose/unit-tests/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 77ab70f13c..428aaa4425 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,8 @@ UI_RELEASE_FLAG_FILE = awx/ui/.release_built virtualbox-ovf virtualbox-centos-7 virtualbox-centos-6 \ clean-bundle setup_bundle_tarball \ ui-docker-machine ui-docker ui-release \ - ui-test ui-test-ci ui-test-saucelabs + ui-test ui-deps ui-test-ci ui-test-saucelabs jlaska + # Remove setup build files clean-tar: @@ -505,6 +506,8 @@ test_jenkins : test_coverage # UI TASKS # -------------------------------------- +ui-deps: $(UI_DEPS_FLAG_FILE) + $(UI_DEPS_FLAG_FILE): awx/ui/package.json $(NPM_BIN) --unsafe-perm --prefix awx/ui install awx/ui touch $(UI_DEPS_FLAG_FILE) diff --git a/tools/docker-compose/unit-tests/Dockerfile b/tools/docker-compose/unit-tests/Dockerfile index cb95cfc7d8..b3c6f33832 100644 --- a/tools/docker-compose/unit-tests/Dockerfile +++ b/tools/docker-compose/unit-tests/Dockerfile @@ -58,7 +58,7 @@ COPY awx/ui/package.json awx/ui/ RUN npm set progress=false -RUN make ui-deps-built +RUN make ui-deps ENTRYPOINT ["/bin/bash", "-c"] CMD ["bash"]