From 93e367b668d03110d6cc2e7dfd06876a101e011a Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Tue, 20 Nov 2018 00:18:29 +0100 Subject: [PATCH] Move 0x97 pdsnadmin to separate folders The docker image names will stay with the same tag. Delete alpine version of pdns-admin-uwsgi as it was broken. --- .../Dockerfile | 0 .../pdns-nginx.conf | 0 .../Dockerfile | 0 .../config.py.tpl | 0 .../docker-cmd.sh | 0 .../pdns-admin.ini | 0 pdns-admin-uwsgi/Dockerfile.alpine | 47 ------------------- 7 files changed, 47 deletions(-) rename {pdns-admin-static => pdns-admin-static-0x97}/Dockerfile (100%) rename {pdns-admin-static => pdns-admin-static-0x97}/pdns-nginx.conf (100%) rename {pdns-admin-uwsgi => pdns-admin-uwsgi-0x97}/Dockerfile (100%) rename {pdns-admin-uwsgi => pdns-admin-uwsgi-0x97}/config.py.tpl (100%) rename {pdns-admin-uwsgi => pdns-admin-uwsgi-0x97}/docker-cmd.sh (100%) rename {pdns-admin-uwsgi => pdns-admin-uwsgi-0x97}/pdns-admin.ini (100%) delete mode 100644 pdns-admin-uwsgi/Dockerfile.alpine diff --git a/pdns-admin-static/Dockerfile b/pdns-admin-static-0x97/Dockerfile similarity index 100% rename from pdns-admin-static/Dockerfile rename to pdns-admin-static-0x97/Dockerfile diff --git a/pdns-admin-static/pdns-nginx.conf b/pdns-admin-static-0x97/pdns-nginx.conf similarity index 100% rename from pdns-admin-static/pdns-nginx.conf rename to pdns-admin-static-0x97/pdns-nginx.conf diff --git a/pdns-admin-uwsgi/Dockerfile b/pdns-admin-uwsgi-0x97/Dockerfile similarity index 100% rename from pdns-admin-uwsgi/Dockerfile rename to pdns-admin-uwsgi-0x97/Dockerfile diff --git a/pdns-admin-uwsgi/config.py.tpl b/pdns-admin-uwsgi-0x97/config.py.tpl similarity index 100% rename from pdns-admin-uwsgi/config.py.tpl rename to pdns-admin-uwsgi-0x97/config.py.tpl diff --git a/pdns-admin-uwsgi/docker-cmd.sh b/pdns-admin-uwsgi-0x97/docker-cmd.sh similarity index 100% rename from pdns-admin-uwsgi/docker-cmd.sh rename to pdns-admin-uwsgi-0x97/docker-cmd.sh diff --git a/pdns-admin-uwsgi/pdns-admin.ini b/pdns-admin-uwsgi-0x97/pdns-admin.ini similarity index 100% rename from pdns-admin-uwsgi/pdns-admin.ini rename to pdns-admin-uwsgi-0x97/pdns-admin.ini diff --git a/pdns-admin-uwsgi/Dockerfile.alpine b/pdns-admin-uwsgi/Dockerfile.alpine deleted file mode 100644 index 13a24cf..0000000 --- a/pdns-admin-uwsgi/Dockerfile.alpine +++ /dev/null @@ -1,47 +0,0 @@ -FROM alpine:3.7 -MAINTAINER "Peter Schiffer" - -RUN apk add --no-cache \ - curl \ - py-pip \ - uwsgi-python \ - py-mysqldb \ - py-pyldap \ - py-cffi \ - py-bcrypt \ - mariadb-client - -RUN mkdir -p /opt/powerdns-admin \ - && curl -sSL https://git.0x97.io/0x97/powerdns-admin/repository/master/archive.tar.gz \ - | 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 \ - && sed -i '/bcrypt/d' /opt/powerdns-admin/requirements.txt \ - && chown -R root: /opt/powerdns-admin \ - && chown -R uwsgi: /opt/powerdns-admin/upload - -WORKDIR /opt/powerdns-admin - -RUN pip install envtpl \ - && pip install -r requirements.txt \ - && rm -rf ~/.cache/* - -ENV 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 9494 - -VOLUME [ "/opt/powerdns-admin/upload" ] - -COPY pdns-admin.ini /etc/uwsgi/conf.d/ -RUN chown uwsgi: /etc/uwsgi/conf.d/pdns-admin.ini \ - && ln -s /etc/uwsgi/uwsgi.ini /etc/uwsgi.ini - -COPY config.py.tpl / -COPY docker-cmd.sh / - -CMD [ "/docker-cmd.sh" ]