External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 06:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update unittest container to build ui-deps

Browse Source
This commit is contained in:
James Laska
2016-10-19 12:35:59 -04:00
parent 54683cbff4
commit ff8966dd48
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -185,7 +185,8 @@ UI_RELEASE_FLAG_FILE = awx/ui/.release_built
virtualbox-ovf virtualbox-centos-7 virtualbox-centos-6 \ virtualbox-ovf virtualbox-centos-7 virtualbox-centos-6 \
clean-bundle setup_bundle_tarball \ clean-bundle setup_bundle_tarball \
ui-docker-machine ui-docker ui-release \ 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 # Remove setup build files
clean-tar: clean-tar:
@@ -505,6 +506,8 @@ test_jenkins : test_coverage
# UI TASKS # UI TASKS
# -------------------------------------- # --------------------------------------
ui-deps: $(UI_DEPS_FLAG_FILE)
$(UI_DEPS_FLAG_FILE): awx/ui/package.json $(UI_DEPS_FLAG_FILE): awx/ui/package.json
$(NPM_BIN) --unsafe-perm --prefix awx/ui install awx/ui $(NPM_BIN) --unsafe-perm --prefix awx/ui install awx/ui
touch $(UI_DEPS_FLAG_FILE) touch $(UI_DEPS_FLAG_FILE)

2
tools/docker-compose/unit-tests/Dockerfile
View File

@@ -58,7 +58,7 @@ COPY awx/ui/package.json awx/ui/
RUN npm set progress=false RUN npm set progress=false
RUN make ui-deps-built RUN make ui-deps
ENTRYPOINT ["/bin/bash", "-c"] ENTRYPOINT ["/bin/bash", "-c"]
CMD ["bash"] CMD ["bash"]