From 5cbbcc98614e237c97d802d8c98556fee5efb925 Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Mon, 6 Dec 2021 21:26:30 +0100 Subject: [PATCH] Update alpine to v3.15.0 (#236) * Set alpine version to 3.15.0 * Revert workaround for py3-cryptography --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1fc3374..a377dc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15.0 WORKDIR /workdir @@ -6,16 +6,12 @@ ADD requirements.txt /workdir/ 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 \ + apk --update --no-cache add ca-certificates chromium chromium-chromedriver py3-cryptography \ python3-dev py3-grpcio py3-wheel py3-pip py3-lxml \ build-base git libxml2 libxml2-dev libxslt libxslt-dev libffi-dev openssl-dev cargo && \ pip install -r requirements.txt && \ apk del build-base -# As alpine's py3-cryptography did not work as of alpine v3.14, we use this hack from -# https://github.com/pyca/cryptography/issues/3344#issuecomment-650845512 -RUN LDFLAGS="-L/opt/openssl/lib -Wl,-rpath,/opt/openssl/lib" CFLAGS="-I/opt/openssl/include" pip3 install -U cryptography - ADD cli.py /workdir/ ADD manager /workdir/manager ADD config /workdir/config