bump compose version

Jenkinsfile

@@ -1,84 +1,115 @@
 pipeline {
-	agent {
+  agent {
-  		label 'pi501.in.thelinuxpro.net'
+    label 'pi501.in.thelinuxpro.net'
+  }
+
+  stages {
+    stage("verify tooling") {
+      steps {
+	sh '''
+        docker version
+	docker info
+        docker compose version
+        '''
+      }
+    }
+
+    stage("Build Containers and push to registry") {
+      steps {
+	script {
+	  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."
+	  }
 	}
+      }
+    }
 
-	stages {
+    stage('Stop primary container') {
-    		stage("verify tooling") {
+      steps {
-      			steps {
+	script {
-				sh '''
+	  if (status_p != 0) {
-          			docker version
+	    sh 'docker compose down'
-		          	docker info
+	    sh 'sleep 5'
-          			docker compose version
+	  }
-        			'''
+        }
-      			}
+      }
-    		}
+    }
 
-		stage("Build Containers and push to registry") {
+    stage('Start primary container') {
-			steps {
+      steps {
-				sh 'docker compose build --push'
+	script {
-			}
+	  if (status_p != 0) {
-		}
+	    sh 'docker compose down'
+	    sh 'docker compose up -d --no-color primary'
+	    sh 'docker compose ps'
+	  }
+	}
+      }
+    }
 
-    		stage('Stop primary container') {
+    stage('Create contexts') {
-      			steps {
+      steps {
-				sh 'docker compose down'
+    	sh 'docker context ls | grep pi502 || docker context create pi502 --docker "host=ssh://pi502.in.thelinuxpro.net"'
-				sh 'sleep 5'
+      }
-			}
+    }
-		}
 
-    		stage('Start primary container') {
+    stage('Stop secondary container') {
-      			steps {
+      steps {
-				sh 'docker compose down'
+	script {
-        			sh 'docker compose up -d --no-color primary'
+	  if (status_s != 0) {
-        			sh 'docker compose ps'
+	    sh 'docker --context pi502 compose down'
-      			}
+	    sh 'sleep 5'
-		}
+	  }
+	}
+      }
+    }
 
-		stage('Create contexts') {
+    stage('Start secondary container') {
-			steps {
+      steps {
-				sh 'docker context ls | grep pi502 || docker context create pi502 --docker "host=ssh://pi502.in.thelinuxpro.net"'
+	script {
-			}
+	  if (status_s != 0) {
-		}
+	    sh 'docker --context pi502 compose up -d --no-color secondary'
+	    sh 'docker --context pi502 compose ps'
+	  }
+	}
+      }
+    }
 
-    		stage('Stop secondary container') {
+    stage('test primary dns') {
-      			steps {
+      steps {
-				sh 'docker --context pi502 compose down'
+	sh 'dig ns1.thelinuxpro.net ANY @204.8.15.80'
-				sh 'sleep 5'
+	sh 'dig ns1.in.thelinuxpro.net ANY @10.99.153.241'
-			}
+        sh 'dig ns1.thelinuxpro.net ANY @204.8.15.81'
-		}
+        sh 'dig ns1.in.thelinuxpro.net ANY @10.99.153.242'
+        sh 'dig kameronkenny.com @204.8.15.80 a'
+        sh 'dig kameronkenny.com @10.99.153.241 a'
+        sh 'dig kameronkenny.com @204.8.15.81 a'
+        sh 'dig kameronkenny.com @10.99.153.242 a'
+      }
+   }
 
-    		stage('Start secondary container') {
+    stage('verify SOA serial') {
-      			steps {
+      steps {
-        			sh 'docker --context pi502 compose up -d --no-color secondary'
+	sh 'dig +multi ns1.thelinuxpro.net ANY @204.8.15.80 soa'
-        			sh 'docker --context pi502 compose ps'
+	sh 'dig +multi ns1.in.thelinuxpro.net ANY @10.99.153.241 soa'
-      			}
+  	sh 'dig +multi ns1.thelinuxpro.net ANY @204.8.15.81 soa'
-		}
+	sh 'dig +multi ns1.in.thelinuxpro.net ANY @10.99.153.242 soa'
-
+	sh 'dig +multi kameronkenny.com @204.8.15.80 soa'
-		stage('test primary dns') {
+	sh 'dig +multi kameronkenny.com @10.99.153.241 soa'
-			steps {
+	sh 'dig +multi kameronkenny.com @204.8.15.81 soa'
-				sh 'dig ns1.thelinuxpro.net ANY @204.8.15.80'
+	sh 'dig +multi kameronkenny.com @10.99.153.242 soa'
-				sh 'dig ns1.in.thelinuxpro.net ANY @10.99.153.241'
+      }
-				sh 'dig ns1.thelinuxpro.net ANY @204.8.15.81'
+    }
-				sh 'dig ns1.in.thelinuxpro.net ANY @10.99.153.242'
+  }
-				sh 'dig kameronkenny.com @204.8.15.80 a'
-				sh 'dig kameronkenny.com @10.99.153.241 a'
-				sh 'dig kameronkenny.com @204.8.15.81 a'
-				sh 'dig kameronkenny.com @10.99.153.242 a'
-			}
-    		}
-
-		stage('verify SOA serial') {
-			steps {
-				sh 'dig +multi ns1.thelinuxpro.net ANY @204.8.15.80 soa'
-				sh 'dig +multi ns1.in.thelinuxpro.net ANY @10.99.153.241 soa'
-				sh 'dig +multi ns1.thelinuxpro.net ANY @204.8.15.81 soa'
-				sh 'dig +multi ns1.in.thelinuxpro.net ANY @10.99.153.242 soa'
-				sh 'dig +multi kameronkenny.com @204.8.15.80 soa'
-				sh 'dig +multi kameronkenny.com @10.99.153.241 soa'
-				sh 'dig +multi kameronkenny.com @204.8.15.81 soa'
-				sh 'dig +multi kameronkenny.com @10.99.153.242 soa'
-			}
-		}
-  	}
 }

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.1
+    image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240515.2.2
     restart: always
     user: root
     environment:

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

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