deblan/PowerDNS-Admin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #686 from christianbur/master

Browse source 
Update Alpine 3.10 -> 3.11; update pip, tzdata, gunicorn
This commit is contained in:
Khanh Ngo 2020-03-28 10:49:01 +07:00 committed by GitHub
parent ee8ab848e3 4b4509d839
commit 3ae8fce3b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docker/Dockerfile
View file

@ -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/

4
requirements.txt
View file

@ -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
Flask-Mail==0.9.1