diff --git a/ansible-playbook.yml b/ansible-playbook.yml index f104a12..c108461 100644 --- a/ansible-playbook.yml +++ b/ansible-playbook.yml @@ -1,5 +1,6 @@ --- -- hosts: localhost +- name: PDNS + hosts: localhost vars: pdns_master_ip: 172.5.0.20 pdns_slave_ip: 172.5.0.21 @@ -8,8 +9,8 @@ i_state: present alpine: false tasks: - - name: create docker network - docker_network: + - name: Create docker network + community.docker.docker_network: name: pdns-net state: present ipam_config: @@ -20,8 +21,8 @@ - pdns-admin - pdns-recursor - - name: build pdns recursor - docker_image: + - name: Build pdns recursor + community.docker.docker_image: name: pschiffe/pdns-recursor state: '{{ i_state }}' source: build @@ -32,8 +33,8 @@ tags: - pdns-recursor - - name: build pdns recursor alpine version - docker_image: + - name: Build pdns recursor alpine version + community.docker.docker_image: name: pschiffe/pdns-recursor tag: alpine state: '{{ i_state }}' @@ -46,26 +47,26 @@ tags: - pdns-recursor - - name: pdns recursor - docker_container: + - name: PDNS recursor + community.docker.docker_container: name: pdns-recursor image: pschiffe/pdns-recursor:{{ "alpine" if alpine | bool else "latest" }} state: '{{ c_state }}' - networks_cli_compatible: true networks: - name: pdns-net volumes: - /etc/localtime:/etc/localtime:ro + ulimits: + - 'nofile:5000:5000' tags: - pdns-recursor - - name: db - docker_container: + - name: DB + community.docker.docker_container: name: pdns-mariadb - image: mariadb:10.11 + image: mariadb:11 pull: true state: '{{ c_state }}' - networks_cli_compatible: true networks: - name: pdns-net aliases: @@ -77,19 +78,18 @@ env: MYSQL_ROOT_PASSWORD: 'my-secret-pw' healthcheck: - test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost'] + test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized'] timeout: 10s retries: 5 tags: - db - - name: phpmyadmin - docker_container: + - name: Phpmyadmin + community.docker.docker_container: name: pdns-phpmyadmin image: phpmyadmin:5 pull: true state: '{{ c_state }}' - networks_cli_compatible: true networks: - name: pdns-net published_ports: @@ -99,8 +99,8 @@ tags: - db - - name: build pdns - docker_image: + - name: Build pdns + community.docker.docker_image: name: pschiffe/pdns-mysql state: '{{ i_state }}' source: build @@ -111,8 +111,8 @@ tags: - pdns - - name: build pdns alpine version - docker_image: + - name: Build pdns alpine version + community.docker.docker_image: name: pschiffe/pdns-mysql tag: alpine state: '{{ i_state }}' @@ -125,13 +125,12 @@ tags: - pdns - - name: pdns master - docker_container: + - name: PDNS master + community.docker.docker_container: name: pdns image: pschiffe/pdns-mysql:{{ "alpine" if alpine | bool else "latest" }} state: '{{ c_state }}' hostname: ns1.example.com - networks_cli_compatible: true networks: - name: pdns-net ipv4_address: '{{ pdns_master_ip }}' @@ -155,13 +154,12 @@ tags: - pdns - - name: pdns slave - docker_container: + - name: PDNS slave + community.docker.docker_container: name: pdns-slave image: pschiffe/pdns-mysql:{{ "alpine" if alpine | bool else "latest" }} state: '{{ c_state }}' hostname: ns2.example.com - networks_cli_compatible: true networks: - name: pdns-net ipv4_address: '{{ pdns_slave_ip }}' @@ -185,8 +183,8 @@ tags: - pdns - - name: build pdns-admin base - docker_image: + - name: Build pdns-admin base + community.docker.docker_image: name: pschiffe/pdns-admin-base tag: latest state: '{{ i_state }}' @@ -198,8 +196,8 @@ tags: - pdns-admin - - name: build pdns-admin backend - docker_image: + - name: Build pdns-admin backend + community.docker.docker_image: name: pschiffe/pdns-admin-uwsgi tag: latest state: '{{ i_state }}' @@ -211,8 +209,8 @@ tags: - pdns-admin - - name: build pdns-admin frontent - docker_image: + - name: Build pdns-admin frontent + community.docker.docker_image: name: pschiffe/pdns-admin-static tag: latest state: '{{ i_state }}' @@ -224,12 +222,11 @@ tags: - pdns-admin - - name: pdns-admin backend - docker_container: + - name: PDNS-admin backend + community.docker.docker_container: name: pdns-admin-uwsgi image: pschiffe/pdns-admin-uwsgi state: '{{ c_state }}' - networks_cli_compatible: true networks: - name: pdns-net aliases: @@ -238,17 +235,16 @@ - /etc/localtime:/etc/localtime:ro env: PDNS_ADMIN_SQLA_DB_PASSWORD: "'my-secret-pw'" - PDNS_VERSION: "4.7" + PDNS_VERSION: "4.8" PDNS_API_KEY: "secret" tags: - pdns-admin - - name: pdns-admin frontend - docker_container: + - name: PDNS-admin frontend + community.docker.docker_container: name: pdns-admin-static image: pschiffe/pdns-admin-static state: '{{ c_state }}' - networks_cli_compatible: true networks: - name: pdns-net published_ports: @@ -258,14 +254,14 @@ tags: - pdns-admin - - name: remove docker volumes - command: docker volume rm pdns-mariadb-volume - ignore_errors: true + - name: Remove docker volume + community.docker.docker_volume: + name: pdns-mariadb-volume + state: absent when: wipe | bool - - name: remove network - docker_network: + - name: Remove network + community.docker.docker_network: name: pdns-net state: absent - ignore_errors: true when: wipe | bool diff --git a/docker-compose.yml b/docker-compose.yml index 8fffb22..abae0bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,9 +8,13 @@ services: - pdns volumes: - /etc/localtime:/etc/localtime:ro + ulimits: + nofile: + soft: 5000 + hard: 5000 mariadb: - image: mariadb:10.11 + image: mariadb:11 networks: pdns: aliases: @@ -22,7 +26,7 @@ services: environment: - MYSQL_ROOT_PASSWORD=my-secret-pw healthcheck: - test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost'] + test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized'] timeout: 10s retries: 5 @@ -100,7 +104,7 @@ services: - /etc/localtime:/etc/localtime:ro environment: - PDNS_ADMIN_SQLA_DB_PASSWORD='my-secret-pw' - - PDNS_VERSION=4.7 + - PDNS_VERSION=4.8 - PDNS_API_KEY=secret depends_on: - mariadb diff --git a/examples/kubernetes/admin-dashboard.yaml b/examples/kubernetes/admin-dashboard.yaml index f4df6db..bf19846 100644 --- a/examples/kubernetes/admin-dashboard.yaml +++ b/examples/kubernetes/admin-dashboard.yaml @@ -58,7 +58,7 @@ spec: - name: PDNS_API_URL value: "http://master-api-pdns:8081/" - name: PDNS_VERSION - value: "4.7" + value: "4.8" - name: PDNS_API_KEY valueFrom: secretKeyRef: diff --git a/examples/kubernetes/mariadb.yaml b/examples/kubernetes/mariadb.yaml index 061dac5..44dcd88 100644 --- a/examples/kubernetes/mariadb.yaml +++ b/examples/kubernetes/mariadb.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: mariadb-pdns - image: mariadb:10.11 + image: mariadb:11 imagePullPolicy: Always env: - name: MYSQL_ROOT_PASSWORD