Compare commits

..

3 Commits

Author SHA1 Message Date
Kameron Kenny 6c98db3473
bump compose version 2024-05-15 18:49:27 -04:00
Kameron Kenny 0ad9a47221
cleanup jenkins and add if logic. 2024-05-15 18:49:10 -04:00
Kameron Kenny 4d5e90bc46
fix origin 2024-05-15 18:48:56 -04:00
3 changed files with 118 additions and 84 deletions

33
Jenkinsfile vendored
View File

@ -16,24 +16,47 @@ pipeline {
stage("Build Containers and push to registry") { stage("Build Containers and push to registry") {
steps { steps {
sh 'docker compose build --push' 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."
}
}
} }
} }
stage('Stop primary container') { stage('Stop primary container') {
steps { steps {
script {
if (status_p != 0) {
sh 'docker compose down' sh 'docker compose down'
sh 'sleep 5' sh 'sleep 5'
} }
} }
}
}
stage('Start primary container') { stage('Start primary container') {
steps { steps {
script {
if (status_p != 0) {
sh 'docker compose down' sh 'docker compose down'
sh 'docker compose up -d --no-color primary' sh 'docker compose up -d --no-color primary'
sh 'docker compose ps' sh 'docker compose ps'
} }
} }
}
}
stage('Create contexts') { stage('Create contexts') {
steps { steps {
@ -43,17 +66,25 @@ pipeline {
stage('Stop secondary container') { stage('Stop secondary container') {
steps { steps {
script {
if (status_s != 0) {
sh 'docker --context pi502 compose down' sh 'docker --context pi502 compose down'
sh 'sleep 5' sh 'sleep 5'
} }
} }
}
}
stage('Start secondary container') { stage('Start secondary container') {
steps { steps {
script {
if (status_s != 0) {
sh 'docker --context pi502 compose up -d --no-color secondary' sh 'docker --context pi502 compose up -d --no-color secondary'
sh 'docker --context pi502 compose ps' sh 'docker --context pi502 compose ps'
} }
} }
}
}
stage('test primary dns') { stage('test primary dns') {
steps { steps {

View File

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

View File

@ -1,16 +1,19 @@
$ORIGIN net.
$TTL 2m $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 ns1 IN A 204.8.15.80
ns2 IN A 204.8.15.81 ns2 IN A 204.8.15.81