darkspir/docker-pdns
1
0
Fork 0
mirror of https://github.com/pschiffe/docker-pdns.git synced 2024-09-21 07:05:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify apk add commands, some clean ups

Browse source
This commit is contained in:
Peter Schiffer 2017-12-11 14:57:44 +01:00
parent ad5ddbd894
commit 2422110d64
6 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ansible-playbook.yml
View file

@ -153,7 +153,7 @@
- pdns-admin-upload:/opt/powerdns-admin/upload - pdns-admin-upload:/opt/powerdns-admin/upload
env: env:
PDNS_ADMIN_SQLA_DB_PASSWORD: "'my-secret-pw'" PDNS_ADMIN_SQLA_DB_PASSWORD: "'my-secret-pw'"
PDNS_ADMIN_PDNS_VERSION: "'4.0.4'" PDNS_ADMIN_PDNS_VERSION: "'4.0'"
PDNS_ADMIN_PDNS_API_KEY: "'secret'" PDNS_ADMIN_PDNS_API_KEY: "'secret'"
tags: tags:
- pdns-admin - pdns-admin

25
pdns-admin-uwsgi/Dockerfile.alpine
View file

@ -1,18 +1,15 @@
FROM alpine:3.7 FROM alpine:3.7
MAINTAINER "Peter Schiffer" <pschiffe@redhat.com> MAINTAINER "Peter Schiffer" <pschiffe@redhat.com>
RUN set -xe \ RUN apk add --no-cache \
&& apk update --no-cache && apk upgrade --no-cache \ curl \
&& apk add --update --no-cache \ py-pip \
curl \ uwsgi-python \
py-pip \ py-mysqldb \
uwsgi-python \ py-pyldap \
py-mysqldb \ py-cffi \
py-pyldap \ py-bcrypt \
py-cffi \ mariadb-client
py-bcrypt \
mariadb-client \
&& rm -rf /var/cache/apk/*
RUN mkdir -p /opt/powerdns-admin \ RUN mkdir -p /opt/powerdns-admin \
&& curl -sSL https://git.0x97.io/0x97/powerdns-admin/repository/master/archive.tar.gz \ && curl -sSL https://git.0x97.io/0x97/powerdns-admin/repository/master/archive.tar.gz \
@ -41,8 +38,8 @@ EXPOSE 9494
VOLUME [ "/opt/powerdns-admin/upload" ] VOLUME [ "/opt/powerdns-admin/upload" ]
COPY pdns-admin.ini /etc/uwsgi/conf.d/ COPY pdns-admin.ini /etc/uwsgi/conf.d/
RUN chown uwsgi: /etc/uwsgi/conf.d/pdns-admin.ini && \ RUN chown uwsgi: /etc/uwsgi/conf.d/pdns-admin.ini \
ln -s /etc/uwsgi/uwsgi.ini /etc/uwsgi.ini && ln -s /etc/uwsgi/uwsgi.ini /etc/uwsgi.ini
COPY config.py.tpl / COPY config.py.tpl /
COPY docker-cmd.sh / COPY docker-cmd.sh /

2
pdns-recursor/Dockerfile
View file

@ -8,7 +8,7 @@ RUN dnf -y --setopt=install_weak_deps=False install \
RUN pip3 install envtpl \ RUN pip3 install envtpl \
&& rm -rf ~/.cache/* && rm -rf ~/.cache/*
ENV VERSION=4.0.6 \ ENV VERSION=4.0 \
PDNS_setuid=recursor \ PDNS_setuid=recursor \
PDNS_setgid=recursor \ PDNS_setgid=recursor \
PDNS_daemon=no PDNS_daemon=no

9
pdns-recursor/Dockerfile.alpine
View file

@ -1,15 +1,14 @@
FROM alpine:3.7 FROM alpine:3.7
MAINTAINER "Peter Schiffer" <pschiffe@redhat.com> MAINTAINER "Peter Schiffer" <pschiffe@redhat.com>
RUN set -xe \ RUN apk add --no-cache \
&& apk update --no-cache && apk upgrade --no-cache \ pdns-recursor \
&& apk add --update --no-cache pdns-recursor python3 \ python3
&& rm -rf /var/cache/apk/*
RUN pip3 install envtpl \ RUN pip3 install envtpl \
&& rm -rf ~/.cache/* && rm -rf ~/.cache/*
ENV VERSION=4.0.6 \ ENV VERSION=4.0 \
PDNS_setuid=recursor \ PDNS_setuid=recursor \
PDNS_setgid=recursor \ PDNS_setgid=recursor \
PDNS_daemon=no PDNS_daemon=no

2
pdns/Dockerfile
View file

@ -11,7 +11,7 @@ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
RUN pip3 install envtpl \ RUN pip3 install envtpl \
&& rm -rf ~/.cache/* && rm -rf ~/.cache/*
ENV VERSION=4.0.4 \ ENV VERSION=4.0 \
PDNS_guardian=yes \ PDNS_guardian=yes \
PDNS_setuid=pdns \ PDNS_setuid=pdns \
PDNS_setgid=pdns \ PDNS_setgid=pdns \

12
pdns/Dockerfile.alpine
View file

@ -1,15 +1,17 @@
FROM alpine:3.7 FROM alpine:3.7
MAINTAINER "Peter Schiffer" <pschiffe@redhat.com> MAINTAINER "Peter Schiffer" <pschiffe@redhat.com>
RUN set -xe \ RUN apk add --no-cache \
&& apk update --no-cache && apk upgrade --no-cache \ pdns \
&& apk add --update --no-cache pdns pdns-backend-mysql pdns-doc python3 mariadb-client \ pdns-backend-mysql \
&& rm -rf /var/cache/apk/* pdns-doc \
python3 \
mariadb-client
RUN pip3 install envtpl \ RUN pip3 install envtpl \
&& rm -rf ~/.cache/* && rm -rf ~/.cache/*
ENV VERSION=4.0.4 \ ENV VERSION=4.0 \
PDNS_guardian=yes \ PDNS_guardian=yes \
PDNS_setuid=pdns \ PDNS_setuid=pdns \
PDNS_setgid=pdns \ PDNS_setgid=pdns \