From e599933ef8c5a812933aac3e1928255bc71ddd34 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Sun, 11 Jul 2021 10:08:04 -0700 Subject: [PATCH] fix requirements --- apps/cic-eth/docker/Dockerfile | 12 +++++++++--- apps/cic-eth/docker/Dockerfile_ci | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index 1af28dc0..2404c5e7 100644 --- a/apps/cic-eth/docker/Dockerfile +++ b/apps/cic-eth/docker/Dockerfile @@ -13,11 +13,17 @@ ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages # --force-reinstall \ # --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ # -r requirements.txt - -COPY . . +COPY *requirements.txt . RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ pip install --index-url https://pypi.org/simple \ - --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL . + --extra-index-url $GITLAB_PYTHON_REGISTRY \ + --extra-index-url $EXTRA_INDEX_URL \ + -r requirements.txt \ + -r services_requirements.txt \ + -r admin_requirements.txt + +COPY . . +RUN python setup.py install ENV PYTHONPATH . diff --git a/apps/cic-eth/docker/Dockerfile_ci b/apps/cic-eth/docker/Dockerfile_ci index 27955b32..89efdcc6 100644 --- a/apps/cic-eth/docker/Dockerfile_ci +++ b/apps/cic-eth/docker/Dockerfile_ci @@ -14,10 +14,16 @@ ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages # --force-reinstall \ # --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ # -r requirements.txt - -COPY . . +COPY *requirements.txt . RUN pip install --index-url https://pypi.org/simple \ - --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL . + --extra-index-url $GITLAB_PYTHON_REGISTRY \ + --extra-index-url $EXTRA_INDEX_URL \ + -r requirements.txt \ + -r services_requirements.txt \ + -r admin_requirements.txt + +COPY . . +RUN python setup.py install COPY docker/entrypoints/* ./ RUN chmod 755 *.sh