fix conflict

This commit is contained in:
Kameron Kenny - pi501 2024-04-20 21:30:41 -04:00
parent 44ff6a5b9a
commit 6fbb89da32
1 changed files with 9 additions and 5 deletions

View File

@ -1,5 +1,7 @@
--- ---
#volumes: volumes:
bind9_logs:
driver: local
# bind9_cache: # bind9_cache:
# driver: local # driver: local
# primary_var_lib_bind: # primary_var_lib_bind:
@ -16,13 +18,14 @@ services:
container_name: ns1 container_name: ns1
build: build:
dockerfile: Dockerfile.primary dockerfile: Dockerfile.primary
image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240420.06 image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240420.08
restart: always restart: always
user: root user: root
environment: environment:
- TZ='America/Indianapolis' - TZ='America/Indianapolis'
- BIND9_USER=bind - BIND9_USER=bind
# volumes: volumes:
- bind9_logs:/var/named/log
#- primary_var_lib_bind:/var/lib/bind #- primary_var_lib_bind:/var/lib/bind
#- ./primary/var/lib/bind:/var/lib/bind:rw #- ./primary/var/lib/bind:/var/lib/bind:rw
#- ./primary/etc/bind/named.conf:/etc/bind/named.conf #- ./primary/etc/bind/named.conf:/etc/bind/named.conf
@ -38,13 +41,14 @@ services:
container_name: ns2 container_name: ns2
build: build:
dockerfile: Dockerfile.secondary dockerfile: Dockerfile.secondary
image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-secondary:240420.05 image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-secondary:240420.06
restart: always restart: always
user: root user: root
environment: environment:
- TZ='America/Indianapolis' - TZ='America/Indianapolis'
- BIND9_USER=bind - BIND9_USER=bind
#volumes: volumes:
- bind9_logs:/var/named/log
#- secondary_var_lib_bind:/var/lib/bind #- secondary_var_lib_bind:/var/lib/bind
#- ./secondary/var/lib/bind:/var/lib/bind:rw #- ./secondary/var/lib/bind:/var/lib/bind:rw
#- ./secondary/etc/bind/named.conf:/etc/bind/named.conf:ro #- ./secondary/etc/bind/named.conf:/etc/bind/named.conf:ro