From 7bff1db47ab8cae5ffd012bbcc24581c1a73b15e Mon Sep 17 00:00:00 2001 From: Pankaj Patil Date: Mon, 21 Oct 2019 20:46:11 +0530 Subject: [PATCH 1/7] --no-cache-dir option added --- .taskcluster.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.taskcluster.yml b/.taskcluster.yml index 51b9b4d9a..abc545919 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -65,8 +65,8 @@ tasks: - sh - -lxce - "git clone --quiet ${repository} /src && cd /src && git checkout ${head_rev} -b checks && - cd /src/bot && pip install --quiet -r requirements-dev.txt && - cd /src/backend && pip install --quiet -r requirements-dev.txt && + cd /src/bot && pip install --disable-pip-version-check --no-cache-dir --quiet -r requirements-dev.txt && + cd /src/backend && pip install --disable-pip-version-check --no-cache-dir --quiet -r requirements-dev.txt && cd /src && pre-commit run -a" metadata: name: "Code Coverage checks: linting" @@ -88,7 +88,7 @@ tasks: - "git clone --quiet ${repository} /src && cd /src && git checkout ${head_rev} -b checks && /src/bot/ci/bootstrap.sh && cd /src/tools && python3 setup.py install && - cd /src/bot && pip3 install --quiet . && pip3 install --quiet -r requirements-dev.txt && + cd /src/bot && pip3 install --disable-pip-version-check --no-cache-dir --quiet . && pip3 install --disable-pip-version-check --no-cache-dir --quiet -r requirements-dev.txt && pytest -v" metadata: name: "Code Coverage Bot checks: unit tests" @@ -109,7 +109,7 @@ tasks: - -lxce - "git clone --quiet ${repository} /src && cd /src && git checkout ${head_rev} -b checks && cd /src/tools && python setup.py install && - cd /src/backend && pip install --quiet . && pip install --quiet -r requirements-dev.txt && + cd /src/backend && pip install --disable-pip-version-check --no-cache-dir --quiet . && pip install --disable-pip-version-check --no-cache-dir --quiet -r requirements-dev.txt && pytest -v" metadata: name: "Code Coverage Backend checks: unit tests" @@ -129,7 +129,7 @@ tasks: - sh - -lxce - "git clone --quiet ${repository} /src && cd /src && git checkout ${head_rev} -b checks && - cd /src/events && pip install -q -r requirements.txt && pip install --quiet . && pip install --quiet -r requirements-dev.txt && + cd /src/events && pip install --disable-pip-version-check --no-cache-dir --quiet -q -r requirements.txt && pip install --disable-pip-version-check --no-cache-dir --quiet . && pip install --disable-pip-version-check --no-cache-dir --quiet -r requirements-dev.txt && pytest -v" metadata: name: "Code Coverage Events checks: unit tests" From 142765d17a9371ae34d8814a16aef1fc711c5db8 Mon Sep 17 00:00:00 2001 From: Pankaj Patil Date: Thu, 24 Oct 2019 19:25:58 +0530 Subject: [PATCH 2/7] Updated DockerFile --- backend/Dockerfile | 4 ++-- bot/Dockerfile | 4 ++-- events/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index d9abfd03f..c33ba82a8 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -3,7 +3,7 @@ FROM python:3.7-slim ADD tools /src/tools ADD backend /src/backend -RUN cd /src/tools && python setup.py install -RUN cd /src/backend && python setup.py install +RUN cd /src/tools && python --disable-pip-version-check --no-cache-dir --quiet setup.py install +RUN cd /src/backend && python --disable-pip-version-check --no-cache-dir --quiet setup.py install CMD ["gunicorn", "code_coverage_backend.flask:app", "--timeout", "30"] diff --git a/bot/Dockerfile b/bot/Dockerfile index 9d1138aea..d0cb1cd76 100644 --- a/bot/Dockerfile +++ b/bot/Dockerfile @@ -5,7 +5,7 @@ ADD bot /src/bot RUN /src/bot/ci/bootstrap.sh -RUN cd /src/tools && python setup.py install -RUN cd /src/bot && python setup.py install +RUN cd /src/tools && python --disable-pip-version-check --no-cache-dir --quiet setup.py install +RUN cd /src/bot && python --disable-pip-version-check --no-cache-dir --quiet setup.py install CMD ["code-coverage-bot"] diff --git a/events/Dockerfile b/events/Dockerfile index b07a4bff6..979a5f1a7 100644 --- a/events/Dockerfile +++ b/events/Dockerfile @@ -4,7 +4,7 @@ FROM python:3.7-slim ADD tools /src/tools ADD events /src/events -RUN cd /src/tools && python setup.py install -RUN cd /src/events && python setup.py install +RUN cd /src/tools && python --disable-pip-version-check --no-cache-dir --quiet setup.py install +RUN cd /src/events && python --disable-pip-version-check --no-cache-dir --quiet setup.py install CMD ["code-coverage-events"] From 83fca25f1ab7775c05de46c46d002fa43a6d597c Mon Sep 17 00:00:00 2001 From: Pankaj Patil Date: Thu, 24 Oct 2019 20:02:18 +0530 Subject: [PATCH 3/7] DockerFile Ch --- backend/Dockerfile | 4 ++-- bot/Dockerfile | 4 ++-- events/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index c33ba82a8..08ae09f96 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -3,7 +3,7 @@ FROM python:3.7-slim ADD tools /src/tools ADD backend /src/backend -RUN cd /src/tools && python --disable-pip-version-check --no-cache-dir --quiet setup.py install -RUN cd /src/backend && python --disable-pip-version-check --no-cache-dir --quiet setup.py install +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet setup.py +RUN cd /src/backend && pip install --disable-pip-version-check --no-cache-dir --quiet setup.py CMD ["gunicorn", "code_coverage_backend.flask:app", "--timeout", "30"] diff --git a/bot/Dockerfile b/bot/Dockerfile index d0cb1cd76..091d707a6 100644 --- a/bot/Dockerfile +++ b/bot/Dockerfile @@ -5,7 +5,7 @@ ADD bot /src/bot RUN /src/bot/ci/bootstrap.sh -RUN cd /src/tools && python --disable-pip-version-check --no-cache-dir --quiet setup.py install -RUN cd /src/bot && python --disable-pip-version-check --no-cache-dir --quiet setup.py install +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet setup.py +RUN cd /src/bot && pip install--disable-pip-version-check --no-cache-dir --quiet setup.py CMD ["code-coverage-bot"] diff --git a/events/Dockerfile b/events/Dockerfile index 979a5f1a7..c87cd8bba 100644 --- a/events/Dockerfile +++ b/events/Dockerfile @@ -4,7 +4,7 @@ FROM python:3.7-slim ADD tools /src/tools ADD events /src/events -RUN cd /src/tools && python --disable-pip-version-check --no-cache-dir --quiet setup.py install -RUN cd /src/events && python --disable-pip-version-check --no-cache-dir --quiet setup.py install +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet setup.py +RUN cd /src/events && pip install --disable-pip-version-check --no-cache-dir --quiet setup.py CMD ["code-coverage-events"] From ff233b864bd94744548bed1ed4f4cff7febc5f7f Mon Sep 17 00:00:00 2001 From: Pankaj Patil Date: Thu, 24 Oct 2019 20:06:43 +0530 Subject: [PATCH 4/7] DockerFile Changed --- backend/Dockerfile | 4 ++-- bot/Dockerfile | 4 ++-- events/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 08ae09f96..151409680 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -3,7 +3,7 @@ FROM python:3.7-slim ADD tools /src/tools ADD backend /src/backend -RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet setup.py -RUN cd /src/backend && pip install --disable-pip-version-check --no-cache-dir --quiet setup.py +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/backend && pip install --disable-pip-version-check --no-cache-dir --quiet . CMD ["gunicorn", "code_coverage_backend.flask:app", "--timeout", "30"] diff --git a/bot/Dockerfile b/bot/Dockerfile index 091d707a6..68ad281a3 100644 --- a/bot/Dockerfile +++ b/bot/Dockerfile @@ -5,7 +5,7 @@ ADD bot /src/bot RUN /src/bot/ci/bootstrap.sh -RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet setup.py -RUN cd /src/bot && pip install--disable-pip-version-check --no-cache-dir --quiet setup.py +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/bot && pip install--disable-pip-version-check --no-cache-dir --quiet . CMD ["code-coverage-bot"] diff --git a/events/Dockerfile b/events/Dockerfile index c87cd8bba..bf8c42238 100644 --- a/events/Dockerfile +++ b/events/Dockerfile @@ -4,7 +4,7 @@ FROM python:3.7-slim ADD tools /src/tools ADD events /src/events -RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet setup.py -RUN cd /src/events && pip install --disable-pip-version-check --no-cache-dir --quiet setup.py +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/events && pip install --disable-pip-version-check --no-cache-dir --quiet . CMD ["code-coverage-events"] From 7162ed7b975890b9d38559f6e9427fb5d5cbacbd Mon Sep 17 00:00:00 2001 From: Pankaj Patil Date: Wed, 30 Oct 2019 11:51:46 +0530 Subject: [PATCH 5/7] Lint Error Fixed --- backend/Dockerfile | 4 ++-- bot/Dockerfile | 4 ++-- events/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 151409680..ef276c4e3 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -3,7 +3,7 @@ FROM python:3.7-slim ADD tools /src/tools ADD backend /src/backend -RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . -RUN cd /src/backend && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/backend && pip install --disable-pip-version-check --no-cache-dir --quiet . CMD ["gunicorn", "code_coverage_backend.flask:app", "--timeout", "30"] diff --git a/bot/Dockerfile b/bot/Dockerfile index 68ad281a3..b57cf5ec2 100644 --- a/bot/Dockerfile +++ b/bot/Dockerfile @@ -5,7 +5,7 @@ ADD bot /src/bot RUN /src/bot/ci/bootstrap.sh -RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . -RUN cd /src/bot && pip install--disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/bot && pip install --disable-pip-version-check --no-cache-dir --quiet . CMD ["code-coverage-bot"] diff --git a/events/Dockerfile b/events/Dockerfile index bf8c42238..8e8054c66 100644 --- a/events/Dockerfile +++ b/events/Dockerfile @@ -4,7 +4,7 @@ FROM python:3.7-slim ADD tools /src/tools ADD events /src/events -RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . -RUN cd /src/events && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/events && pip install --disable-pip-version-check --no-cache-dir --quiet . CMD ["code-coverage-events"] From d0feb6fd98cd82115189947584891c79c6423515 Mon Sep 17 00:00:00 2001 From: Pankaj Patil Date: Wed, 30 Oct 2019 13:29:51 +0530 Subject: [PATCH 6/7] Apply suggestions from code review Co-Authored-By: Bastien Abadie --- backend/Dockerfile | 2 +- bot/Dockerfile | 2 +- events/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index ef276c4e3..5b350f1e7 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -4,6 +4,6 @@ ADD tools /src/tools ADD backend /src/backend RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . -RUN cd /src/backend && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/backend && pip install --disable-pip-version-check --no-cache-dir --quiet . CMD ["gunicorn", "code_coverage_backend.flask:app", "--timeout", "30"] diff --git a/bot/Dockerfile b/bot/Dockerfile index b57cf5ec2..c166e614d 100644 --- a/bot/Dockerfile +++ b/bot/Dockerfile @@ -5,7 +5,7 @@ ADD bot /src/bot RUN /src/bot/ci/bootstrap.sh -RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . RUN cd /src/bot && pip install --disable-pip-version-check --no-cache-dir --quiet . CMD ["code-coverage-bot"] diff --git a/events/Dockerfile b/events/Dockerfile index 8e8054c66..c82a393e0 100644 --- a/events/Dockerfile +++ b/events/Dockerfile @@ -4,7 +4,7 @@ FROM python:3.7-slim ADD tools /src/tools ADD events /src/events -RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . RUN cd /src/events && pip install --disable-pip-version-check --no-cache-dir --quiet . CMD ["code-coverage-events"] From f404309c2491301a96821dc1d56897930e4f22e0 Mon Sep 17 00:00:00 2001 From: Pankaj Patil Date: Wed, 30 Oct 2019 13:40:38 +0530 Subject: [PATCH 7/7] Update events/Dockerfile Co-Authored-By: Bastien Abadie --- events/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events/Dockerfile b/events/Dockerfile index c82a393e0..dc7cf789e 100644 --- a/events/Dockerfile +++ b/events/Dockerfile @@ -5,6 +5,6 @@ ADD tools /src/tools ADD events /src/events RUN cd /src/tools && pip install --disable-pip-version-check --no-cache-dir --quiet . -RUN cd /src/events && pip install --disable-pip-version-check --no-cache-dir --quiet . +RUN cd /src/events && pip install --disable-pip-version-check --no-cache-dir --quiet . CMD ["code-coverage-events"]