image

2024-10-20 14:05:17 -04:00 · 2024-10-20 14:05:17 -04:00 · baa2fb0f1e
parent c404ed2efb
commit baa2fb0f1e
1 changed files with 4 additions and 0 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -18,7 +18,11 @@ services:
    container_name: ns1
    build:
      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:240625.1.1
+>>>>>>> 94cf43d (image)
    restart: always
    user: root
    environment: