mirror of
https://github.com/pschiffe/docker-pdns.git
synced 2024-11-13 03:47:56 +01:00
Update images to Fedora 31
This also updates the pdns to version 4.2
This commit is contained in:
parent
9924b78305
commit
2ca17d9d18
3 changed files with 18 additions and 15 deletions
|
@ -1,10 +1,10 @@
|
|||
FROM fedora:30
|
||||
FROM fedora:31
|
||||
|
||||
RUN curl -sSL -o /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo
|
||||
|
||||
RUN dnf -y --setopt=install_weak_deps=False install \
|
||||
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 \
|
||||
python3-ldap \
|
||||
python3-mysql \
|
||||
python3-pip \
|
||||
python3-xmlsec \
|
||||
uwsgi \
|
||||
yarn \
|
||||
|
@ -15,15 +15,15 @@ RUN mkdir -p /opt/powerdns-admin \
|
|||
| tar -xzC /opt/powerdns-admin --strip 1 \
|
||||
&& sed -i '/python-ldap/d' /opt/powerdns-admin/requirements.txt \
|
||||
&& sed -i '/mysqlclient/d' /opt/powerdns-admin/requirements.txt \
|
||||
&& chown -R root: /opt/powerdns-admin \
|
||||
&& chown -R uwsgi: /opt/powerdns-admin/upload
|
||||
&& chown -R root: /opt/powerdns-admin
|
||||
|
||||
WORKDIR /opt/powerdns-admin
|
||||
|
||||
RUN pip3 install --no-cache-dir envtpl python-dotenv \
|
||||
&& pip3 install -r requirements.txt --no-cache-dir
|
||||
|
||||
ENV PDNS_ADMIN_LOG_LEVEL="'INFO'" \
|
||||
ENV FLASK_APP=/opt/powerdns-admin/powerdnsadmin/__init__.py \
|
||||
PDNS_ADMIN_LOG_LEVEL="'INFO'" \
|
||||
PDNS_ADMIN_SAML_ENABLED=False
|
||||
|
||||
COPY config.py.tpl /
|
||||
|
@ -31,6 +31,7 @@ COPY config.py.tpl /
|
|||
RUN envtpl < /config.py.tpl > /opt/powerdns-admin/config.py \
|
||||
&& sed -i '/SQLALCHEMY_DATABASE_URI/d' /opt/powerdns-admin/config.py
|
||||
|
||||
RUN yarn install --pure-lockfile \
|
||||
RUN yarn install --pure-lockfile --production \
|
||||
&& yarn cache clean \
|
||||
&& flask assets build \
|
||||
&& chown -R uwsgi: /opt/powerdns-admin/app/static/.webassets-cache
|
||||
&& chown -R uwsgi: /opt/powerdns-admin/powerdnsadmin/static/.webassets-cache
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
FROM fedora:30
|
||||
FROM fedora:31
|
||||
|
||||
RUN dnf -y --setopt=install_weak_deps=False install \
|
||||
pdns-recursor \
|
||||
python3-pip \
|
||||
&& dnf clean all
|
||||
|
||||
RUN pip3 install --no-cache-dir envtpl
|
||||
|
@ -9,7 +10,7 @@ RUN pip3 install --no-cache-dir envtpl
|
|||
RUN mkdir -p /etc/pdns-recursor/api.d \
|
||||
&& chown -R pdns-recursor: /etc/pdns-recursor/api.d
|
||||
|
||||
ENV VERSION=4.1 \
|
||||
ENV VERSION=4.2 \
|
||||
PDNS_setuid=pdns-recursor \
|
||||
PDNS_setgid=pdns-recursor \
|
||||
PDNS_daemon=no
|
||||
|
|
|
@ -1,16 +1,17 @@
|
|||
FROM fedora:30
|
||||
FROM fedora:31
|
||||
|
||||
RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
|
||||
&& dnf -y --setopt=install_weak_deps=False install \
|
||||
hostname \
|
||||
mariadb \
|
||||
pdns \
|
||||
pdns-backend-mysql \
|
||||
mariadb \
|
||||
hostname \
|
||||
python3-pip \
|
||||
&& dnf clean all
|
||||
|
||||
RUN pip3 install --no-cache-dir envtpl
|
||||
|
||||
ENV VERSION=4.1 \
|
||||
ENV VERSION=4.2 \
|
||||
PDNS_guardian=yes \
|
||||
PDNS_setuid=pdns \
|
||||
PDNS_setgid=pdns \
|
||||
|
|
Loading…
Reference in a new issue