From bf7c27bd10ee1f384096c279cbb88171f1ef8de0 Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Tue, 25 May 2021 10:50:41 +0200 Subject: [PATCH] Update Dockerfile to alpine:edge and chromium v90 --- Dockerfile | 18 ++++++++---------- requirements.txt | 2 -- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index f5c957c..b3db6b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,16 @@ -FROM python:3.7-alpine3.13 +FROM alpine:edge WORKDIR /workdir ADD requirements.txt /workdir/ -RUN echo "foobar" - -RUN echo "http://dl-4.alpinelinux.org/alpine/v3.13/main" >> /etc/apk/repositories && \ - echo "http://dl-4.alpinelinux.org/alpine/v3.13/community" >> /etc/apk/repositories && \ - apk update && \ - apk --no-cache add chromium chromium-chromedriver python3-dev build-base git py3-lxml libxml2 libxml2-dev libxslt libxslt-dev libffi-dev openssl-dev cargo && \ - pip3 install --upgrade pip && \ - pip3 install -r requirements.txt && \ - apk del python3-dev build-base +RUN echo "http://dl-4.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ + echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \ + apk --update --no-cache add ca-certificates chromium chromium-chromedriver \ + python3-dev py3-pip py3-lxml py3-cryptography \ + build-base git libxml2 libxml2-dev libxslt libxslt-dev libffi-dev openssl-dev cargo && \ + pip install -r requirements.txt && \ + apk del build-base ADD cli.py /workdir/ ADD manager /workdir/manager diff --git a/requirements.txt b/requirements.txt index b7a0010..95f70a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,6 @@ grpcio==1.37.1 html-similarity==0.3.3 httpretty==0.9.7 idna==2.10 -lxml==4.6.3 parsel==1.6.0 protobuf==3.15.8 pyasn1==0.4.8 @@ -36,7 +35,6 @@ responses==0.13.3 rq==1.8.0 rsa==4.7.2 selenium==3.141.0 -six==1.16.0 smmap==3.0.4 smmap2==2.0.5 soupsieve==2.2.1