Replace mysql with mariadb command

Increase nofile limit for recursor
Update to f41 & alpine 3.21
2025-01-18 19:11:14 +01:00 · 2025-01-01 22:30:06 +01:00 · 2025-01-01 21:13:42 +01:00 · 2025-01-01 20:59:11 +01:00
15 changed files with 33 additions and 33 deletions
--- a/ansible-playbook-mysql.yml
+++ b/ansible-playbook-mysql.yml
@ -57,7 +57,7 @@
        volumes:
          - /etc/localtime:/etc/localtime:ro
        ulimits:
-          - 'nofile:5000:5000'
+          - 'nofile:10000:10000'
      tags:
        - pdns-recursor

@ -78,7 +78,7 @@
        env:
          MYSQL_ROOT_PASSWORD: 'my-secret-pw'
        healthcheck:
-          test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized']
+          test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
          timeout: 10s
          retries: 5
      tags:
@ -217,7 +217,7 @@
          - /etc/localtime:/etc/localtime:ro
        env:
          PDNS_ADMIN_SQLA_DB_PASSWORD: 'my-secret-pw'
-          PDNS_VERSION: '4.8'
+          PDNS_VERSION: '4.9'
          PDNS_API_KEY: 'secret'
      tags:
        - pdns-admin
--- a/ansible-playbook-pgsql.yml
+++ b/ansible-playbook-pgsql.yml
@ -57,7 +57,7 @@
        volumes:
          - /etc/localtime:/etc/localtime:ro
        ulimits:
-          - 'nofile:5000:5000'
+          - 'nofile:10000:10000'
      tags:
        - pdns-recursor

@ -217,7 +217,7 @@
          PDNS_ADMIN_SQLA_DB_PORT: '5432'
          PDNS_ADMIN_SQLA_DB_USER: 'postgres'
          PDNS_ADMIN_SQLA_DB_PASSWORD: 'my-secret-pw'
-          PDNS_VERSION: '4.8'
+          PDNS_VERSION: '4.9'
          PDNS_API_KEY: 'secret'
      tags:
        - pdns-admin
--- a/docker-compose-mysql-ipv6.yml
+++ b/docker-compose-mysql-ipv6.yml
@ -9,8 +9,8 @@ services:
      - /etc/localtime:/etc/localtime:ro
    ulimits:
      nofile:
-        soft: 5000
-        hard: 5000
+        soft: 10000
+        hard: 10000

  mariadb:
    image: mariadb:11-ubi
@ -26,7 +26,7 @@ services:
    environment:
      - MYSQL_ROOT_PASSWORD=my-secret-pw
    healthcheck:
-      test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized']
+      test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
      timeout: 10s
      retries: 5

@ -112,7 +112,7 @@ services:
      - /etc/localtime:/etc/localtime:ro
    environment:
      - PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw
-      - PDNS_VERSION=4.8
+      - PDNS_VERSION=4.9
      - PDNS_API_KEY=secret
    depends_on:
      - mariadb
--- a/docker-compose-mysql.yml
+++ b/docker-compose-mysql.yml
@ -8,8 +8,8 @@ services:
      - /etc/localtime:/etc/localtime:ro
    ulimits:
      nofile:
-        soft: 5000
-        hard: 5000
+        soft: 10000
+        hard: 10000

  mariadb:
    image: mariadb:11-ubi
@ -24,7 +24,7 @@ services:
    environment:
      - MYSQL_ROOT_PASSWORD=my-secret-pw
    healthcheck:
-      test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized']
+      test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
      timeout: 10s
      retries: 5

@ -108,7 +108,7 @@ services:
      - /etc/localtime:/etc/localtime:ro
    environment:
      - PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw
-      - PDNS_VERSION=4.8
+      - PDNS_VERSION=4.9
      - PDNS_API_KEY=secret
    depends_on:
      - mariadb
--- a/docker-compose-pgsql.yml
+++ b/docker-compose-pgsql.yml
@ -8,8 +8,8 @@ services:
      - /etc/localtime:/etc/localtime:ro
    ulimits:
      nofile:
-        soft: 5000
-        hard: 5000
+        soft: 10000
+        hard: 10000

  postgres:
    image: postgres:16-alpine
@ -108,7 +108,7 @@ services:
      - PDNS_ADMIN_SQLA_DB_PORT=5432
      - PDNS_ADMIN_SQLA_DB_USER=postgres
      - PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw
-      - PDNS_VERSION=4.8
+      - PDNS_VERSION=4.9
      - PDNS_API_KEY=secret
    depends_on:
      - postgres
--- a/examples/kubernetes/admin-dashboard.yaml
+++ b/examples/kubernetes/admin-dashboard.yaml
@ -48,7 +48,7 @@ spec:
        - name: PDNS_API_URL
          value: "http://master-api-pdns:8081/"
        - name: PDNS_VERSION
-          value: "4.8"
+          value: "4.9"
        - name: PDNS_API_KEY
          valueFrom:
            secretKeyRef:
--- a/pdns-admin/Dockerfile
+++ b/pdns-admin/Dockerfile
@ -28,7 +28,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
    uwsgi \
    uwsgi-plugin-python3 \
    yarn \
-    https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
+    https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
  && dnf clean all

 RUN mkdir -p /opt/powerdns-admin \
--- a/pdns-admin/config.py.tpl
+++ b/pdns-admin/config.py.tpl
@ -15,7 +15,7 @@ CAPTCHA_SESSION_KEY = 'captcha_image'

 SESSION_TYPE = 'sqlalchemy'

-# SAML Authnetication
+# SAML Authentication
 SAML_ENABLED = False

 # Configuration from env vars
--- a/pdns-admin/docker-entrypoint.sh
+++ b/pdns-admin/docker-entrypoint.sh
@ -39,7 +39,7 @@ subvars --prefix 'PDNS_ADMIN_' < '/config.py.tpl' > '/opt/powerdns-admin/powerdn

 # Initialize DB if needed
 if [[ "${PDNS_ADMIN_SQLA_DB_TYPE}" == 'mysql' ]]; then
-    SQL_COMMAND="mysql -h ${PDNS_ADMIN_SQLA_DB_HOST} -P ${PDNS_ADMIN_SQLA_DB_PORT} -u ${PDNS_ADMIN_SQLA_DB_USER} -p${PDNS_ADMIN_SQLA_DB_PASSWORD} -e"
+    SQL_COMMAND="mariadb -h ${PDNS_ADMIN_SQLA_DB_HOST} -P ${PDNS_ADMIN_SQLA_DB_PORT} -u ${PDNS_ADMIN_SQLA_DB_USER} -p${PDNS_ADMIN_SQLA_DB_PASSWORD} -e"
 elif [[ "${PDNS_ADMIN_SQLA_DB_TYPE}" == 'postgres' ]]; then
    PGPASSWORD="${PDNS_ADMIN_SQLA_DB_PASSWORD}"
    export PGPASSWORD
--- a/pdns-mysql/Dockerfile
+++ b/pdns-mysql/Dockerfile
@ -1,4 +1,4 @@
-FROM fedora:40
+FROM fedora:41

 RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
  && echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
@ -9,7 +9,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
    hostname \
    mariadb \
    pdns \
-    https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
+    https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
  && dnf --setopt 'tsflags=' install pdns-backend-mysql \
  && dnf clean all

@ -18,7 +18,7 @@ RUN mkdir -p /run/pdns \

 COPY pdns.conf.tpl docker-entrypoint.sh /

-ENV VERSION=4.8 \
+ENV VERSION=4.9 \
  PDNS_guardian=yes \
  PDNS_setuid=pdns \
  PDNS_setgid=pdns \
--- a/pdns-mysql/Dockerfile.alpine
+++ b/pdns-mysql/Dockerfile.alpine
@ -1,4 +1,4 @@
-FROM alpine:3.20.0
+FROM alpine:3.21

 RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
  && apk update \
@ -8,7 +8,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
    pdns \
    pdns-backend-mysql \
    pdns-doc \
-  && wget -O subvars.apk https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
+  && wget -O subvars.apk https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
  && apk add --allow-untrusted subvars.apk \
  && rm -rf subvars.apk /var/cache/apk/*

--- a/pdns-mysql/docker-entrypoint.sh
+++ b/pdns-mysql/docker-entrypoint.sh
@ -51,7 +51,7 @@ generateMySQLCommand() {
      EXTRA="${EXTRA} --socket=${PDNS_gmysql_socket}"
  fi

-  MYSQL_COMMAND="mysql -h ${PDNS_gmysql_host} -P ${PDNS_gmysql_port} -u ${PDNS_gmysql_user}${EXTRA}"
+  MYSQL_COMMAND="mariadb -h ${PDNS_gmysql_host} -P ${PDNS_gmysql_port} -u ${PDNS_gmysql_user}${EXTRA}"
 }

 createDatabaseIfRequested() {
--- a/pdns-pgsql/Dockerfile
+++ b/pdns-pgsql/Dockerfile
@ -1,4 +1,4 @@
-FROM fedora:40
+FROM fedora:41

 RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
  && echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
@ -9,7 +9,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
    hostname \
    pdns \
    postgresql16 \
-    https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
+    https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
  && dnf --setopt 'tsflags=' install pdns-backend-postgresql \
  && dnf clean all

@ -18,7 +18,7 @@ RUN mkdir -p /run/pdns \

 COPY pdns.conf.tpl docker-entrypoint.sh /

-ENV VERSION=4.8 \
+ENV VERSION=4.9 \
  PDNS_guardian=yes \
  PDNS_setuid=pdns \
  PDNS_setgid=pdns \
--- a/pdns-pgsql/Dockerfile.alpine
+++ b/pdns-pgsql/Dockerfile.alpine
@ -1,4 +1,4 @@
-FROM alpine:3.20.0
+FROM alpine:3.21

 RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
  && apk update \
@ -8,7 +8,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
    pdns-backend-pgsql \
    pdns-doc \
    postgresql16-client \
-  && wget -O subvars.apk https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
+  && wget -O subvars.apk https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
  && apk add --allow-untrusted subvars.apk \
  && rm -rf subvars.apk /var/cache/apk/*

--- a/pdns-recursor/docker-entrypoint.sh
+++ b/pdns-recursor/docker-entrypoint.sh
@ -4,7 +4,7 @@ set -eu

 #### Function definitions

-deriveConfigValuesFromEnvrionement() {
+deriveConfigValuesFromEnvironment() {
  # Configure base vars
  : "${PDNS_local_port:=53}"
  : "${PDNS_local_address:=0.0.0.0}"
@ -24,7 +24,7 @@ elif [ -f /etc/alpine-release ]; then
 fi

 if [ "${USE_EXISTING_CONFIG_FILE:-false}" = 'false' ]; then
-    deriveConfigValuesFromEnvrionement
+    deriveConfigValuesFromEnvironment
    echo "Generating config file from environment"
    subvars --prefix 'PDNS_' < '/recursor.conf.tpl' > "${config_file}"
    chown "${pdns_user}:" "${config_file}"
Author	SHA1	Message	Date
Peter Schiffer	9618517672	Replace mysql with mariadb command Some checks failed Docker Image CI / build-recursor-latest (push) Has been cancelled Details Docker Image CI / build-recursor-alpine (push) Has been cancelled Details Docker Image CI / build-pdns-mysql-latest (push) Has been cancelled Details Docker Image CI / build-pdns-mysql-alpine (push) Has been cancelled Details Docker Image CI / build-pdns-pgsql-latest (push) Has been cancelled Details Docker Image CI / build-pdns-pgsql-alpine (push) Has been cancelled Details Docker Image CI / build-pdns-admin (push) Has been cancelled Details	2025-01-01 22:30:06 +01:00
Peter Schiffer	036420859d	Increase nofile limit for recursor	2025-01-01 21:13:42 +01:00
Peter Schiffer	f14e4be008	Update to f41 & alpine 3.21 There's now pdns 4.9 also in Fedora version.	2025-01-01 20:59:11 +01:00