From 6381d87ec3625f69547619082f29dd90250997b9 Mon Sep 17 00:00:00 2001 From: Christian Burmeister Date: Fri, 13 Mar 2020 00:22:32 +0100 Subject: [PATCH 1/4] Update gunicorn 19.7.1 -> 20.0.4 --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c3d1f0f..f5d6d17 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ python-ldap==3.1.0 pyotp==2.2.6 qrcode==6.0 dnspython==1.15.0 -gunicorn==19.7.1 +gunicorn==20.0.4 python3-saml pyOpenSSL>=0.15 pytz>=2017.3 @@ -26,4 +26,4 @@ pytest==5.0.1 pytimeparse==1.1.8 PyYAML==5.1.1 Flask-SSLify==0.1.5 -Flask-Mail==0.9.1 \ No newline at end of file +Flask-Mail==0.9.1 From 795896d968b61c59623d66b4fcf3798617d044cd Mon Sep 17 00:00:00 2001 From: Christian Burmeister Date: Fri, 13 Mar 2020 00:27:19 +0100 Subject: [PATCH 2/4] Update alpine 3.10 -> 3.11 --- docker/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 73c3126..c871fd8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 AS builder +FROM alpine:3.11 AS builder LABEL maintainer="k@ndk.name" ARG BUILD_DEPENDENCIES="build-base \ @@ -26,7 +26,8 @@ WORKDIR /build COPY ./requirements.txt /build/requirements.txt # Get application dependencies -RUN pip install -r requirements.txt +RUN pip install --upgrade pip && \ + pip install -r requirements.txt # Add sources COPY . /build @@ -69,16 +70,16 @@ RUN pip install pip-autoremove && \ # Build image -FROM alpine:3.10 +FROM alpine:3.11 ENV FLASK_APP=/app/powerdnsadmin/__init__.py -RUN apk add --no-cache mariadb-connector-c postgresql-client py3-gunicorn py3-psycopg2 xmlsec && \ +RUN apk add --no-cache mariadb-connector-c postgresql-client py3-gunicorn py3-psycopg2 xmlsec tzdata && \ addgroup -S pda && \ adduser -S -D -G pda pda COPY --from=builder /usr/bin/flask /usr/bin/ -COPY --from=builder /usr/lib/python3.7/site-packages /usr/lib/python3.7/site-packages/ +COPY --from=builder /usr/lib/python3.8/site-packages /usr/lib/python3.8/site-packages/ COPY --from=builder --chown=pda:pda /app /app/ COPY ./docker/entrypoint.sh /usr/bin/ From 058d475f05ffa9f1b0ee205ce51a529ae969205f Mon Sep 17 00:00:00 2001 From: Christian Burmeister Date: Fri, 13 Mar 2020 00:28:32 +0100 Subject: [PATCH 3/4] Update requirements.txt From 4b4509d839ac001e03d33a482b09861562c05f80 Mon Sep 17 00:00:00 2001 From: Christian Burmeister Date: Fri, 13 Mar 2020 00:30:26 +0100 Subject: [PATCH 4/4] Update gunicorn 19.7.1 -> 20.0.4