mirror of
https://github.com/pschiffe/docker-pdns.git
synced 2025-01-18 19:11:14 +01:00
Rebase to the latest base images
This commit is contained in:
parent
6fe7093c7b
commit
051123a773
6 changed files with 20 additions and 14 deletions
|
@ -62,7 +62,7 @@
|
||||||
- name: db
|
- name: db
|
||||||
docker_container:
|
docker_container:
|
||||||
name: pdns-mariadb
|
name: pdns-mariadb
|
||||||
image: mariadb:10.4
|
image: mariadb:10.5
|
||||||
pull: true
|
pull: true
|
||||||
state: '{{ c_state }}'
|
state: '{{ c_state }}'
|
||||||
networks_cli_compatible: true
|
networks_cli_compatible: true
|
||||||
|
@ -258,7 +258,7 @@
|
||||||
- pdns-admin
|
- pdns-admin
|
||||||
|
|
||||||
- name: remove docker volumes
|
- name: remove docker volumes
|
||||||
command: docker volume rm pdns-mariadb-volume pdns-admin-upload
|
command: docker volume rm pdns-mariadb-volume
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
when: wipe | bool
|
when: wipe | bool
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM fedora:31
|
FROM fedora:32
|
||||||
|
|
||||||
RUN curl -sSL -o /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \
|
RUN curl -sSL -o /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \
|
||||||
&& dnf -y --setopt=install_weak_deps=False install \
|
&& dnf -y --setopt=install_weak_deps=False install \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM fedora:31
|
FROM fedora:32
|
||||||
|
|
||||||
RUN dnf -y --setopt=install_weak_deps=False install \
|
RUN dnf -y --setopt=install_weak_deps=False install \
|
||||||
pdns-recursor \
|
pdns-recursor \
|
||||||
|
@ -8,9 +8,11 @@ RUN dnf -y --setopt=install_weak_deps=False install \
|
||||||
RUN pip3 install --no-cache-dir envtpl
|
RUN pip3 install --no-cache-dir envtpl
|
||||||
|
|
||||||
RUN mkdir -p /etc/pdns-recursor/api.d \
|
RUN mkdir -p /etc/pdns-recursor/api.d \
|
||||||
&& chown -R pdns-recursor: /etc/pdns-recursor/api.d
|
&& chown -R pdns-recursor: /etc/pdns-recursor/api.d \
|
||||||
|
&& mkdir -p /run/pdns-recursor \
|
||||||
|
&& chown -R pdns-recursor: /run/pdns-recursor
|
||||||
|
|
||||||
ENV VERSION=4.2 \
|
ENV VERSION=4.3 \
|
||||||
PDNS_setuid=pdns-recursor \
|
PDNS_setuid=pdns-recursor \
|
||||||
PDNS_setgid=pdns-recursor \
|
PDNS_setgid=pdns-recursor \
|
||||||
PDNS_daemon=no
|
PDNS_daemon=no
|
||||||
|
|
|
@ -1,15 +1,18 @@
|
||||||
FROM alpine:3.11
|
FROM alpine:3.12
|
||||||
|
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
pdns-recursor \
|
pdns-recursor \
|
||||||
|
py3-pip \
|
||||||
python3
|
python3
|
||||||
|
|
||||||
RUN pip3 install --no-cache-dir envtpl
|
RUN pip3 install --no-cache-dir envtpl
|
||||||
|
|
||||||
RUN mkdir -p /etc/pdns/api.d \
|
RUN mkdir -p /etc/pdns/api.d \
|
||||||
&& chown -R recursor: /etc/pdns/api.d
|
&& chown -R recursor: /etc/pdns/api.d \
|
||||||
|
&& mkdir -p /var/run/pdns-recursor \
|
||||||
|
&& chown -R recursor: /var/run/pdns-recursor
|
||||||
|
|
||||||
ENV VERSION=4.2 \
|
ENV VERSION=4.3 \
|
||||||
PDNS_setuid=recursor \
|
PDNS_setuid=recursor \
|
||||||
PDNS_setgid=recursor \
|
PDNS_setgid=recursor \
|
||||||
PDNS_daemon=no
|
PDNS_daemon=no
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM fedora:31
|
FROM fedora:32
|
||||||
|
|
||||||
RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
|
RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
|
||||||
&& dnf -y --setopt=install_weak_deps=False install \
|
&& dnf -y --setopt=install_weak_deps=False install \
|
||||||
|
@ -11,7 +11,7 @@ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
|
||||||
|
|
||||||
RUN pip3 install --no-cache-dir envtpl
|
RUN pip3 install --no-cache-dir envtpl
|
||||||
|
|
||||||
ENV VERSION=4.2 \
|
ENV VERSION=4.3 \
|
||||||
PDNS_guardian=yes \
|
PDNS_guardian=yes \
|
||||||
PDNS_setuid=pdns \
|
PDNS_setuid=pdns \
|
||||||
PDNS_setgid=pdns \
|
PDNS_setgid=pdns \
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
FROM alpine:3.11
|
FROM alpine:3.12
|
||||||
|
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
|
mariadb-client \
|
||||||
pdns \
|
pdns \
|
||||||
pdns-backend-mysql \
|
pdns-backend-mysql \
|
||||||
pdns-doc \
|
pdns-doc \
|
||||||
python3 \
|
py3-pip \
|
||||||
mariadb-client
|
python3
|
||||||
|
|
||||||
RUN pip3 install --no-cache-dir envtpl
|
RUN pip3 install --no-cache-dir envtpl
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue