Commit c8490146 authored by Khanh Ngo's avatar Khanh Ngo
Browse files

Merge remote-tracking branch 'christianbur/master'

parents f2704649 4b4509d8
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/
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment