image
This commit is contained in:
parent
c404ed2efb
commit
baa2fb0f1e
|
@ -18,7 +18,11 @@ services:
|
||||||
container_name: ns1
|
container_name: ns1
|
||||||
build:
|
build:
|
||||||
dockerfile: Dockerfile.primary
|
dockerfile: Dockerfile.primary
|
||||||
|
<<<<<<< HEAD
|
||||||
image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240915.1.1
|
image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240915.1.1
|
||||||
|
=======
|
||||||
|
image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240625.1.1
|
||||||
|
>>>>>>> 94cf43d (image)
|
||||||
restart: always
|
restart: always
|
||||||
user: root
|
user: root
|
||||||
environment:
|
environment:
|
||||||
|
|
Loading…
Reference in New Issue