cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2025-01-08 19:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'christianbur/master'

Browse Source
This commit is contained in:
Khanh Ngo 2020-03-28 09:56:24 +07:00
commit c8490146ed
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" LABEL maintainer="k@ndk.name"
ARG BUILD_DEPENDENCIES="build-base \ ARG BUILD_DEPENDENCIES="build-base \
@ -26,7 +26,8 @@ WORKDIR /build
COPY ./requirements.txt /build/requirements.txt COPY ./requirements.txt /build/requirements.txt
# Get application dependencies # Get application dependencies
RUN pip install -r requirements.txt RUN pip install --upgrade pip && \
pip install -r requirements.txt
# Add sources # Add sources
COPY . /build COPY . /build
@ -69,16 +70,16 @@ RUN pip install pip-autoremove && \
# Build image # Build image
FROM alpine:3.10 FROM alpine:3.11
ENV FLASK_APP=/app/powerdnsadmin/__init__.py 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 && \ addgroup -S pda && \
adduser -S -D -G pda pda adduser -S -D -G pda pda
COPY --from=builder /usr/bin/flask /usr/bin/ 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 --from=builder --chown=pda:pda /app /app/
COPY ./docker/entrypoint.sh /usr/bin/ COPY ./docker/entrypoint.sh /usr/bin/

2
requirements.txt
View File

@ -12,7 +12,7 @@ python-ldap==3.1.0
pyotp==2.2.6 pyotp==2.2.6
qrcode==6.0 qrcode==6.0
dnspython==1.15.0 dnspython==1.15.0
gunicorn==19.7.1 gunicorn==20.0.4
python3-saml python3-saml
pyOpenSSL>=0.15 pyOpenSSL>=0.15
pytz>=2017.3 pytz>=2017.3