From ab8a2915afa43740ddd0207459231c30b8324b10 Mon Sep 17 00:00:00 2001 From: derwentx Date: Tue, 8 Sep 2020 15:27:06 +1000 Subject: [PATCH 1/2] use requirements.txt in docker image --- Dockerfile | 5 ++--- requirements.txt | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 requirements.txt diff --git a/Dockerfile b/Dockerfile index 32676426..7cabed3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN apk add --no-cache \ openjdk8 \ maven \ python \ - py2-pip \ + py3-pip \ perl \ git \ php7 \ @@ -30,8 +30,6 @@ RUN apk add --no-cache \ curl \ ruby -RUN pip install safety==1.8.4 piprot==0.9.10 bandit==1.5.1 - RUN { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ @@ -63,6 +61,7 @@ COPY --from=cargo-audit-build /home/rust/bin/ /usr/local/bin/ WORKDIR /hawkeye COPY . . +RUN pip3 install -r requirements.txt RUN npm install --production --quiet && \ rm -rf /var/cache/apk/* diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..b05889af --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +safety==1.8.4 +piprot==0.9.11 +bandit==1.6.2 From c6dbba6065308df2e5abcba220effe6b9af7cae1 Mon Sep 17 00:00:00 2001 From: derwentx Date: Tue, 8 Sep 2020 15:28:16 +1000 Subject: [PATCH 2/2] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20upgrade=20python-safet?= =?UTF-8?q?y=20to=201.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes https://github.com/hawkeyesec/scanner-cli/issues/163 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b05889af..196b0ed5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -safety==1.8.4 +safety==1.9.0 piprot==0.9.11 bandit==1.6.2