refactor: DNS backend #876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

iyashnov wants to merge 61 commits into dev from refactor_dns_backend

.dns/dns_api.py

This file was deleted.

.dns/entrypoint.sh

This file was deleted.

.dns/templates/zone.template

This file was deleted.

.dns/templates/zone_options.template

This file was deleted.

.docker/Dockerfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ ENV VIRTUAL_ENV=/venvs/.venv \ @@
         VERSION=${VERSION:-beta}
-    RUN set -eux; apk add --no-cache krb5-libs curl openssl netcat-openbsd
+    RUN set -eux; apk add --no-cache krb5-libs curl openssl netcat-openbsd libsodium-dev
     COPY app /app
     COPY pyproject.toml /
@@ Expand Down @@

.docker/bind9.Dockerfile

This file was deleted.

.docker/dev.Dockerfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ ENV VIRTUAL_ENV=/venvs/.venv \ @@
         PATH="/venvs/.venv/bin:$PATH" \
         VERSION=${VERSION:-beta}
-    RUN set -eux; apk add --no-cache krb5-libs curl openssl netcat-openbsd
+    RUN set -eux; apk add --no-cache krb5-libs curl openssl netcat-openbsd libsodium-dev
     COPY app /app
     COPY pyproject.toml /
@@ Expand Down @@

.docker/pdns_auth.Dockerfile

milov-dmitriy marked this conversation as resolved.

Show resolved Hide resolved

-Original file line number
+Diff line change
@@ -0,0 +1,66 @@
+    FROM alpine:3.20 AS builder
+    RUN apk add --no-cache --virtual .build-deps \
+          build-base \
+          lmdb-dev \
+          openssl-dev \
+          boost-dev \
+          autoconf automake libtool \
+          git ragel bison flex \
+          lua5.4-dev \
+          curl-dev
+    RUN apk add --no-cache \
+          lua \
+          lua-dev \
+          lmdb \
+          boost-libs \
+          openssl-libs-static \
+          curl \
+          libstdc++
+    RUN git clone https://github.com/PowerDNS/pdns.git /pdns
+    WORKDIR /pdns
+    RUN git submodule init &&\
+        git submodule update &&\
+        git checkout auth-5.0.1
+    RUN autoreconf -vi
+    RUN mkdir /build && \
+        ./configure \
+          --sysconfdir=/etc/powerdns \
+          --enable-option-checking=fatal \
+          --with-dynmodules='lmdb' \
+          --with-modules='' \
+          --with-unixodbc-lib=/usr/lib/$(dpkg-architecture -q DEB_BUILD_GNU_TYPE) && \
+        make clean && \
+        make $MAKEFLAGS -C ext &&\
+        make $MAKEFLAGS -C modules &&\
+        make $MAKEFLAGS -C pdns && \
+        make -C pdns install DESTDIR=/build &&\
+        make -C modules install DESTDIR=/build &&\
+        make clean && \
+        strip /build/usr/local/bin/* /build/usr/local/sbin/* /build/usr/local/lib/pdns/*.so
+    FROM alpine:3.20 AS runtime
+    COPY --from=builder /build /
+    RUN apk add --no-cache \
+        lua \
+        lua-dev \
+        lmdb \
+        boost-libs \
+        openssl-libs-static \
+        curl \
+        libstdc++
+    RUN mkdir -p /etc/powerdns/pdns.d /var/run/pdns /var/lib/powerdns /etc/powerdns/templates.d /var/lib/pdns-lmdb
+    COPY ./.package/pdns.conf /etc/powerdns/pdns.conf
+    EXPOSE 8082/tcp
+    CMD ["/usr/local/sbin/pdns_server"]

.docker/test.Dockerfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \ @@
     FROM python:3.13.7-alpine3.21 AS runtime
     WORKDIR /app
-    RUN set -eux; apk add --no-cache openldap-clients openssl curl krb5-libs
+    RUN set -eux; apk add --no-cache openldap-clients openssl curl krb5-libs libsodium-dev
     ENV VIRTUAL_ENV=/venvs/.venv \
         PATH="/venvs/.venv/bin:$PATH" \
@@ Expand Down @@

.github/workflows/build-beta.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -156,7 +156,7 @@ jobs:
  
                --build-arg BUILDKIT_INLINE_CACHE=1 \

                --build-arg VERSION=beta

      build-bind9:

      build-pdns_auth:

        runs-on: ubuntu-latest

        needs: [build-tests, run-ssh-test, run-tests]

        steps:

    @@ -173,14 +173,14 @@ jobs:
  
          - name: Build docker image

            env:

              TAG: ghcr.io/${{ env.REPO }}_bind9:beta

              TAG: ghcr.io/${{ env.REPO }}_pdns_auth:beta

              DOCKER_BUILDKIT: '1'

            run: |

              echo $TAG

              docker build \

                --push \

                --target=runtime \

                -f .docker/bind9.Dockerfile . \

                -f .docker/pdns_auth.Dockerfile . \

                -t $TAG \

                --cache-to type=gha,mode=max \

                --cache-from $TAG \

.github/workflows/build-dev.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -155,7 +155,7 @@ jobs:
  
                --build-arg BUILDKIT_INLINE_CACHE=1 \

                --build-arg VERSION=dev

      build-bind9:

      build-pdns_auth:

        runs-on: ubuntu-latest

        needs: [build-tests, run-ssh-test, run-tests]

        steps:

    @@ -172,14 +172,14 @@ jobs:
  
          - name: Build docker image

            env:

              TAG: ghcr.io/${{ env.REPO }}_bind9:dev

              TAG: ghcr.io/${{ env.REPO }}_pdns_auth:dev

              DOCKER_BUILDKIT: '1'

            run: |

              echo $TAG

              docker build \

                --push \

                --target=runtime \

                -f .docker/bind9.Dockerfile . \

                -f .docker/pdns_auth.Dockerfile . \

                -t $TAG \

                --cache-to type=gha,mode=max \

                --cache-from $TAG \

.github/workflows/build-docker-image.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -176,7 +176,7 @@ jobs:
  
                --build-arg BUILDKIT_INLINE_CACHE=1 \

                --build-arg VERSION=latest

      build-bind9:

      build-pdns_auth:

        runs-on: ubuntu-latest

        needs: [build-tests, run-ssh-test, run-tests]

        steps:

    @@ -193,14 +193,14 @@ jobs:
  
          - name: Build docker image

            env:

              TAG: ghcr.io/${{ env.REPO }}_bind9:latest

              TAG: ghcr.io/${{ env.REPO }}_pdns_auth:latest

              DOCKER_BUILDKIT: '1'

            run: |

              echo $TAG

              docker build \

                --push \

                --target=runtime \

                -f .docker/bind9.Dockerfile . \

                -f .docker/pdns_auth.Dockerfile . \

                -t $TAG \

                --cache-to type=gha,mode=max \

                --cache-from $TAG \

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ share/python-wheels/ @@
     .installed.cfg
     *.egg
     MANIFEST
+    resolve.conf
     # PyInstaller
     #  Usually these files are written by a python script from a template
@@ Expand Down @@

.package/dnsdist.conf

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    setLocal('0.0.0.0:53')
+    controlSocket('0.0.0.0:8084')
+    setKey('supersecretapikey')
+    addConsoleACL('172.20.0.0/24')
+    includeDirectory('/etc/dnsdist/conf.d/')
+    setACL('0.0.0.0/0')

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: DNS backend #876

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

refactor: DNS backend #876

Are you sure you want to change the base?

Uh oh!

refactor: DNS backend #876

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!