darkspir/docker-pdns
1
0
Fork 0
mirror of https://github.com/pschiffe/docker-pdns.git synced 2025-01-18 19:11:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update VERSION env var, mariadb and phpmyadmin

Browse source
This commit is contained in:
Peter Schiffer 2023-01-15 17:06:10 +01:00
parent 014b328705
commit 0db0e6259e
No known key found for this signature in database
GPG key ID: F2A18AC34A008397
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ansible-playbook.yml
View file

@ -62,7 +62,7 @@
- name: db - name: db
docker_container: docker_container:
name: pdns-mariadb name: pdns-mariadb
image: mariadb:10.6 image: mariadb:10.10
pull: true pull: true
state: '{{ c_state }}' state: '{{ c_state }}'
networks_cli_compatible: true networks_cli_compatible: true
@ -86,7 +86,7 @@
- name: phpmyadmin - name: phpmyadmin
docker_container: docker_container:
name: pdns-phpmyadmin name: pdns-phpmyadmin
image: phpmyadmin/phpmyadmin:5 image: phpmyadmin:5
pull: true pull: true
state: '{{ c_state }}' state: '{{ c_state }}'
networks_cli_compatible: true networks_cli_compatible: true
@ -238,7 +238,7 @@
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
env: env:
PDNS_ADMIN_SQLA_DB_PASSWORD: "'my-secret-pw'" PDNS_ADMIN_SQLA_DB_PASSWORD: "'my-secret-pw'"
PDNS_VERSION: "4.5" PDNS_VERSION: "4.7"
PDNS_API_KEY: "secret" PDNS_API_KEY: "secret"
tags: tags:
- pdns-admin - pdns-admin

6
docker-compose.yml
View file

@ -10,7 +10,7 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
mariadb: mariadb:
image: mariadb:10.6 image: mariadb:10.10
networks: networks:
pdns: pdns:
aliases: aliases:
@ -27,7 +27,7 @@ services:
retries: 5 retries: 5
phpmyadmin: phpmyadmin:
image: phpmyadmin/phpmyadmin:5 image: phpmyadmin:5
networks: networks:
- pdns - pdns
ports: ports:
@ -100,7 +100,7 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
environment: environment:
- PDNS_ADMIN_SQLA_DB_PASSWORD='my-secret-pw' - PDNS_ADMIN_SQLA_DB_PASSWORD='my-secret-pw'
- PDNS_VERSION=4.5 - PDNS_VERSION=4.7
- PDNS_API_KEY=secret - PDNS_API_KEY=secret
depends_on: depends_on:
- mariadb - mariadb

2
examples/kubernetes/admin-dashboard.yaml
View file

@ -58,7 +58,7 @@ spec:
- name: PDNS_API_URL - name: PDNS_API_URL
value: "http://master-api-pdns:8081/" value: "http://master-api-pdns:8081/"
- name: PDNS_VERSION - name: PDNS_VERSION
value: "4.5" value: "4.7"
- name: PDNS_API_KEY - name: PDNS_API_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

2
examples/kubernetes/mariadb.yaml
View file

@ -27,7 +27,7 @@ spec:
spec: spec:
containers: containers:
- name: mariadb-pdns - name: mariadb-pdns
image: mariadb:10.6 image: mariadb:10.10
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: MYSQL_ROOT_PASSWORD - name: MYSQL_ROOT_PASSWORD

2
pdns-recursor/Dockerfile
View file

@ -13,7 +13,7 @@ RUN mkdir -p /etc/pdns-recursor/api.d \
&& mkdir -p /run/pdns-recursor \ && mkdir -p /run/pdns-recursor \
&& chown -R pdns-recursor: /run/pdns-recursor && chown -R pdns-recursor: /run/pdns-recursor
ENV VERSION=4.5 \ ENV VERSION=4.7 \
PDNS_setuid=pdns-recursor \ PDNS_setuid=pdns-recursor \
PDNS_setgid=pdns-recursor \ PDNS_setgid=pdns-recursor \
PDNS_daemon=no PDNS_daemon=no

2
pdns-recursor/Dockerfile.alpine
View file

@ -12,7 +12,7 @@ RUN mkdir -p /etc/pdns/api.d \
&& mkdir -p /var/run/pdns-recursor \ && mkdir -p /var/run/pdns-recursor \
&& chown -R recursor: /var/run/pdns-recursor && chown -R recursor: /var/run/pdns-recursor
ENV VERSION=4.5 \ ENV VERSION=4.7 \
PDNS_setuid=recursor \ PDNS_setuid=recursor \
PDNS_setgid=recursor \ PDNS_setgid=recursor \
PDNS_daemon=no PDNS_daemon=no

2
pdns/Dockerfile
View file

@ -12,7 +12,7 @@ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \
RUN pip3 install --no-cache-dir 'Jinja2<3.1' envtpl RUN pip3 install --no-cache-dir 'Jinja2<3.1' envtpl
ENV VERSION=4.6 \ ENV VERSION=4.7 \
PDNS_guardian=yes \ PDNS_guardian=yes \
PDNS_setuid=pdns \ PDNS_setuid=pdns \
PDNS_setgid=pdns \ PDNS_setgid=pdns \

2
pdns/Dockerfile.alpine
View file

@ -10,7 +10,7 @@ RUN apk add --no-cache \
RUN pip3 install --no-cache-dir 'Jinja2<3.1' envtpl RUN pip3 install --no-cache-dir 'Jinja2<3.1' envtpl
ENV VERSION=4.5 \ ENV VERSION=4.7 \
PDNS_guardian=yes \ PDNS_guardian=yes \
PDNS_setuid=pdns \ PDNS_setuid=pdns \
PDNS_setgid=pdns \ PDNS_setgid=pdns \