From e10bf8f1146c924062c629461b5e1b10d50e9a9a Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Sun, 26 Nov 2017 00:03:36 +0100 Subject: [PATCH] Update images * move to Fedora 27 * use proper link for pdns-admin source --- README.md | 4 ++-- pdns-admin-static/Dockerfile | 2 +- pdns-admin-uwsgi/Dockerfile | 6 +++--- pdns-admin-uwsgi/pdns-admin.ini | 4 ++-- pdns/Dockerfile | 5 +++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e3a043c..1ded609 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ docker run -d -p 53:53 -p 53:53/udp --name pdns-slave \ https://hub.docker.com/r/pschiffe/pdns-admin-uwsgi/ -Docker image with backend of [PowerDNS Admin](https://git.omicroninteractive.com/0x97/powerdns-admin) web app, written in Flask, for managing PowerDNS servers. This image contains the python part of the app running under uWSGI. It needs external mysql server. Env vars for mysql configuration: +Docker image with backend of [PowerDNS Admin](https://git.0x97.io/0x97/powerdns-admin) web app, written in Flask, for managing PowerDNS servers. This image contains the python part of the app running under uWSGI. It needs external mysql server. Env vars for mysql configuration: ``` (name=default value) @@ -136,7 +136,7 @@ docker run -d --name pdns-admin-uwsgi \ https://hub.docker.com/r/pschiffe/pdns-admin-static/ -Fronted image with nginx and static files for [PowerDNS Admin](https://git.omicroninteractive.com/0x97/powerdns-admin). Exposes port 80 for connections, expects uWSGI backend image under `pdns-admin-uwsgi` alias. +Fronted image with nginx and static files for [PowerDNS Admin](https://git.0x97.io/0x97/powerdns-admin). Exposes port 80 for connections, expects uWSGI backend image under `pdns-admin-uwsgi` alias. ### Example diff --git a/pdns-admin-static/Dockerfile b/pdns-admin-static/Dockerfile index 376d03d..16977a9 100644 --- a/pdns-admin-static/Dockerfile +++ b/pdns-admin-static/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER "Peter Schiffer" RUN apk add --no-cache curl RUN mkdir -p /opt/powerdns-admin \ - && curl -sSLk https://git.omicroninteractive.com/0x97/powerdns-admin/repository/archive.tar.gz?ref=master \ + && curl -sSL https://git.0x97.io/0x97/powerdns-admin/repository/master/archive.tar.gz \ | tar -xzC /opt/powerdns-admin --strip 1 \ && find /opt/powerdns-admin -path /opt/powerdns-admin/app/static -prune -o -type f -exec rm -f {} + \ && chown -R root: /opt/powerdns-admin diff --git a/pdns-admin-uwsgi/Dockerfile b/pdns-admin-uwsgi/Dockerfile index c3ea085..fd256b3 100644 --- a/pdns-admin-uwsgi/Dockerfile +++ b/pdns-admin-uwsgi/Dockerfile @@ -1,7 +1,7 @@ -FROM fedora:26 +FROM fedora:27 MAINTAINER "Peter Schiffer" -RUN dnf -y --setopt=tsflags=nodocs install \ +RUN dnf -y --setopt=install_weak_deps=False install \ python-pip \ python2-mysql \ python-ldap \ @@ -11,7 +11,7 @@ RUN dnf -y --setopt=tsflags=nodocs install \ && dnf clean all RUN mkdir -p /opt/powerdns-admin \ - && curl -sSLk https://git.omicroninteractive.com/0x97/powerdns-admin/repository/archive.tar.gz?ref=master \ + && 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 \ diff --git a/pdns-admin-uwsgi/pdns-admin.ini b/pdns-admin-uwsgi/pdns-admin.ini index ca57053..be11863 100644 --- a/pdns-admin-uwsgi/pdns-admin.ini +++ b/pdns-admin-uwsgi/pdns-admin.ini @@ -1,8 +1,8 @@ [uwsgi] plugins = python -uid=uwsgi -gid=uwsgi +uid = uwsgi +gid = uwsgi chdir = /opt/powerdns-admin pythonpath = /opt/powerdns-admin diff --git a/pdns/Dockerfile b/pdns/Dockerfile index c3acfa4..bc93f79 100644 --- a/pdns/Dockerfile +++ b/pdns/Dockerfile @@ -1,7 +1,8 @@ -FROM fedora:26 +FROM fedora:27 MAINTAINER "Peter Schiffer" -RUN dnf -y install \ +RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \ + && dnf -y --setopt=install_weak_deps=False install \ pdns \ pdns-backend-mysql \ mariadb \