Update images

* move to Fedora 27
* use proper link for pdns-admin source
This commit is contained in:
Peter Schiffer 2017-11-26 00:03:36 +01:00
parent 3daa462bc0
commit e10bf8f114
5 changed files with 11 additions and 10 deletions

View file

@ -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/ 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) (name=default value)
@ -136,7 +136,7 @@ docker run -d --name pdns-admin-uwsgi \
https://hub.docker.com/r/pschiffe/pdns-admin-static/ 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 ### Example

View file

@ -4,7 +4,7 @@ MAINTAINER "Peter Schiffer" <pschiffe@redhat.com>
RUN apk add --no-cache curl RUN apk add --no-cache curl
RUN mkdir -p /opt/powerdns-admin \ 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 \ | tar -xzC /opt/powerdns-admin --strip 1 \
&& find /opt/powerdns-admin -path /opt/powerdns-admin/app/static -prune -o -type f -exec rm -f {} + \ && find /opt/powerdns-admin -path /opt/powerdns-admin/app/static -prune -o -type f -exec rm -f {} + \
&& chown -R root: /opt/powerdns-admin && chown -R root: /opt/powerdns-admin

View file

@ -1,7 +1,7 @@
FROM fedora:26 FROM fedora:27
MAINTAINER "Peter Schiffer" <pschiffe@redhat.com> MAINTAINER "Peter Schiffer" <pschiffe@redhat.com>
RUN dnf -y --setopt=tsflags=nodocs install \ RUN dnf -y --setopt=install_weak_deps=False install \
python-pip \ python-pip \
python2-mysql \ python2-mysql \
python-ldap \ python-ldap \
@ -11,7 +11,7 @@ RUN dnf -y --setopt=tsflags=nodocs install \
&& dnf clean all && dnf clean all
RUN mkdir -p /opt/powerdns-admin \ 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 \ | tar -xzC /opt/powerdns-admin --strip 1 \
&& sed -i '/MySQL-python/d' /opt/powerdns-admin/requirements.txt \ && sed -i '/MySQL-python/d' /opt/powerdns-admin/requirements.txt \
&& sed -i '/python-ldap/d' /opt/powerdns-admin/requirements.txt \ && sed -i '/python-ldap/d' /opt/powerdns-admin/requirements.txt \

View file

@ -1,8 +1,8 @@
[uwsgi] [uwsgi]
plugins = python plugins = python
uid=uwsgi uid = uwsgi
gid=uwsgi gid = uwsgi
chdir = /opt/powerdns-admin chdir = /opt/powerdns-admin
pythonpath = /opt/powerdns-admin pythonpath = /opt/powerdns-admin

View file

@ -1,7 +1,8 @@
FROM fedora:26 FROM fedora:27
MAINTAINER "Peter Schiffer" <pschiffe@redhat.com> MAINTAINER "Peter Schiffer" <pschiffe@redhat.com>
RUN dnf -y install \ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
&& dnf -y --setopt=install_weak_deps=False install \
pdns \ pdns \
pdns-backend-mysql \ pdns-backend-mysql \
mariadb \ mariadb \