Jenkinsfile

@@ -16,47 +16,24 @@ pipeline {
 
 		stage("Build Containers and push to registry") {
 			steps {
-	script {
+				sh 'docker compose build --push'
-	  def status_p = sh(returnStatus: true, script: 'docker images | grep bind9-primary | grep $(grep image docker-compose.yml | grep primary | awk -F\':\' \'{ print $4 }\')')
-	  def status_s = sh(returnStatus: true, script: 'docker images | grep bind9-secondary | grep $(grep image docker-compose.yml | grep secondary | awk -F\':\' \'{ print $4 }\')')
-
-	  if (status_p != 0) {
-	    sh 'docker compose build primary --push'
-	  } else {
-	    echo "Primary Image version already exists, no need to rebuild."
-	  }
-
-	  if (status_s != 0) {
-	    sh 'docker compose build secondary --push'
-	  } else {
-	    echo "Secondary Image version already exists, no need to rebuild."
-	  }
-	}
 			}
 		}
 
     		stage('Stop primary container') {
       			steps {
-	script {
-	  if (status_p != 0) {
 				sh 'docker compose down'
 				sh 'sleep 5'
 			}
 		}
-      }
-    }
 
     		stage('Start primary container') {
       			steps {
-	script {
-	  if (status_p != 0) {
 				sh 'docker compose down'
         			sh 'docker compose up -d --no-color primary'
         			sh 'docker compose ps'
       			}
 		}
-      }
-    }
 
 		stage('Create contexts') {
 			steps {
@@ -66,25 +43,17 @@ pipeline {
 
     		stage('Stop secondary container') {
       			steps {
-	script {
-	  if (status_s != 0) {
 				sh 'docker --context pi502 compose down'
 				sh 'sleep 5'
 			}
 		}
-      }
-    }
 
     		stage('Start secondary container') {
       			steps {
-	script {
-	  if (status_s != 0) {
         			sh 'docker --context pi502 compose up -d --no-color secondary'
         			sh 'docker --context pi502 compose ps'
       			}
 		}
-      }
-    }
 
 		stage('test primary dns') {
 			steps {

docker-compose.yml

@@ -18,7 +18,7 @@ services:
     container_name: ns1
     build:
       dockerfile: Dockerfile.primary
-    image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240515.2.2
+    image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240515.2.1
     restart: always
     user: root
     environment:

primary/var/lib/bind/db.thelinuxpro.net

@@ -1,19 +1,16 @@
-$ORIGIN net.
 $TTL 2m
 
-thelinuxpro	IN	SOA	ns1.thelinuxpro.net. root.thelinuxpro.net. (
+@       IN      SOA     thelinuxpro.net. root.thelinuxpro.net. (
-				24051502	; serial number YYMMDDNN
+                        24051501	; serial number YYMMDDNN
                         1h              ; Refresh
                         15m             ; Retry
                         10d             ; Expire
                         1d              ; Min TTL
 			)
 ;
-		IN	NS	ns1.thelinuxpro.net.
+		NS      ns1.thelinuxpro.net.
-		IN	NS	ns2.thelinuxpro.net.
+		NS      ns2.thelinuxpro.net.
-		IN	TXT	"The Linux Pro Net"
+                TXT     "The Linux Pro Net"
-;
-$ORIGIN thelinuxpro.net.
 ;
 ns1		IN	A	204.8.15.80
 ns2		IN	A	204.8.15.81