mirror of
https://github.com/ansible/awx.git
synced 2026-02-18 11:40:05 -03:30
Move requirements build to unittest Dockerfile
Previously, the requirements were built during compose runtime.
This commit is contained in:
@@ -29,12 +29,34 @@ RUN yum install -y \
|
||||
# Remove the 2 lines below and uncomment the 3 lines above to build
|
||||
# RPMs with the old JS build system.
|
||||
RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash -
|
||||
RUN yum install -y nodejs
|
||||
|
||||
RUN npm set progress=false
|
||||
RUN yum install -y nodejs
|
||||
|
||||
WORKDIR "/ansible-tower"
|
||||
|
||||
ENV VENV_BASE="/venv"
|
||||
# Copy requirements files
|
||||
COPY requirements/*.txt requirements/
|
||||
|
||||
# Copy __init__.py so the Makefile can retrieve `awx.__version__`
|
||||
COPY awx/__init__.py awx/
|
||||
|
||||
# Copy Makefile
|
||||
COPY Makefile .
|
||||
|
||||
# Make tower runtime virtualenvs
|
||||
ENV SWIG_FEATURES="-cpperraswarn -includeall -I/usr/include/openssl"
|
||||
RUN make requirements
|
||||
|
||||
RUN pip install -r requirements/requirements_jenkins.txt
|
||||
# ENV VENV_BASE=""
|
||||
# RUN make requirements_jenkins
|
||||
|
||||
# Build front-end deps
|
||||
COPY awx/ui/package.json awx/ui/
|
||||
|
||||
RUN npm set progress=false
|
||||
|
||||
RUN make ui-deps-built
|
||||
|
||||
ENTRYPOINT ["/bin/bash", "-c"]
|
||||
CMD ["bash"]
|
||||
|
||||
@@ -8,7 +8,6 @@ services:
|
||||
environment:
|
||||
SWIG_FEATURES: "-cpperraswarn -includeall -I/usr/include/openssl"
|
||||
TEST_DIRS: "awx/main/tests/unit"
|
||||
command: ["make requirements_test test"]
|
||||
|
||||
command: ["make test"]
|
||||
volumes:
|
||||
- ../../../:/ansible-tower
|
||||
|
||||
Reference in New Issue
Block a user