From d340dea8499405f8e958b6e26607dde9634d7588 Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Mon, 21 Aug 2017 21:29:16 +0200 Subject: [PATCH] DEPRECATED: This image is now divided into two w/o systemd --- pdns-admin/Dockerfile | 52 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/pdns-admin/Dockerfile b/pdns-admin/Dockerfile index 84b42fd..eeca876 100644 --- a/pdns-admin/Dockerfile +++ b/pdns-admin/Dockerfile @@ -1,44 +1,42 @@ -FROM fedora:24 +FROM fedora:26 MAINTAINER "Peter Schiffer" RUN dnf -y --setopt=tsflags=nodocs install \ - tar \ - python-pip \ - python2-mysql \ - mariadb \ - gcc \ - redhat-rpm-config \ - python-devel \ - openldap-devel \ - nginx \ - uwsgi \ - uwsgi-plugin-python \ - && dnf clean all \ - && systemctl enable nginx \ - && systemctl enable uwsgi + python-pip \ + python2-mysql \ + python-ldap \ + mariadb \ + nginx \ + uwsgi \ + uwsgi-plugin-python \ + && dnf clean all \ + && systemctl enable nginx \ + && systemctl enable uwsgi RUN mkdir -p /opt/powerdns-admin \ - && curl -sSL https://github.com/ngoduykhanh/PowerDNS-Admin/archive/master.tar.gz \ - | tar -xzC /opt/powerdns-admin --strip 1 \ - && chown -R root: /opt/powerdns-admin \ - && chown -R uwsgi: /opt/powerdns-admin/upload + && curl -sSLk https://git.omicroninteractive.com/0x97/powerdns-admin/repository/archive.tar.gz?ref=master \ + | tar -xzC /opt/powerdns-admin --strip 1 \ + && sed -i '/MySQL-python/d' /opt/powerdns-admin/requirements.txt \ + && sed -i '/python-ldap/d' /opt/powerdns-admin/requirements.txt \ + && chown -R root: /opt/powerdns-admin \ + && chown -R uwsgi: /opt/powerdns-admin/upload WORKDIR /opt/powerdns-admin RUN pip3 install envtpl \ - && pip install -r requirements.txt \ - && rm -rf ~/.cache/* + && pip install -r requirements.txt \ + && rm -rf ~/.cache/* STOPSIGNAL SIGRTMIN+3 RUN echo 'ForwardToConsole=yes' >> /etc/systemd/journald.conf ENV container=docker \ - PDNS_ADMIN_LOGIN_TITLE="'PDNS'" \ - PDNS_ADMIN_TIMEOUT=10 \ - PDNS_ADMIN_LOG_LEVEL="'INFO'" \ - PDNS_ADMIN_BASIC_ENABLED=True \ - PDNS_ADMIN_SIGNUP_ENABLED=True \ - PDNS_ADMIN_RECORDS_ALLOW_EDIT="['SOA', 'NS', 'A', 'AAAA', 'CNAME', 'MX', 'TXT', 'SRV']" + PDNS_ADMIN_LOGIN_TITLE="'PDNS'" \ + PDNS_ADMIN_TIMEOUT=10 \ + PDNS_ADMIN_LOG_LEVEL="'INFO'" \ + PDNS_ADMIN_BASIC_ENABLED=True \ + PDNS_ADMIN_SIGNUP_ENABLED=True \ + PDNS_ADMIN_RECORDS_ALLOW_EDIT="['SOA', 'NS', 'A', 'AAAA', 'CNAME', 'MX', 'TXT', 'SRV']" EXPOSE 80