diff --git a/Jenkinsfile b/Jenkinsfile index a8c590c..f355bfa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,21 +50,6 @@ pipeline { } } - stage('Stop container 2') { - steps { - script { - def status = sh(returnStatus: true, script: 'grep $(docker --context pi502 compose ps | tail -n1 | awk \'{ print $2 }\') docker-compose.yml') - - if (status != 0) { - sh 'docker --context pi502 compose down' - sh 'sleep 5' - } else { - echo 'skip' - } - } - } - } - stage('Start container 1') { steps { script { @@ -82,6 +67,21 @@ pipeline { } } + stage('Stop container 2') { + steps { + script { + def status = sh(returnStatus: true, script: 'grep $(docker --context pi502 compose ps | tail -n1 | awk \'{ print $2 }\') docker-compose.yml') + + if (status != 0) { + sh 'docker --context pi502 compose down' + sh 'sleep 5' + } else { + echo 'skip' + } + } + } + } + stage('Start container 2') { steps { script { diff --git a/dnsdist.conf b/dnsdist.conf index 49cbdea..89541f7 100644 --- a/dnsdist.conf +++ b/dnsdist.conf @@ -12,7 +12,7 @@ newServer({address="10.200.53.243", order=3}) ---- Policy setServerPolicy(roundrobin) ---- Cache -pc = newPacketCache(1000000, 86400, 0, 60, 60) +pc = newPacketCache(10000, {maxTTL=86400, minTTL=0, temporaryFailureTTL=60, staleTTL=60, dontAge=false}) getPool(""):setCache(pc) ---- Web-server webserver("0.0.0.0:8083") diff --git a/docker-compose.yml b/docker-compose.yml index 3f746e6..88815ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: build: dockerfile: Dockerfile container_name: dnsdist1 - image: docker-registry1.in.thelinuxpro.net:5000/tlp/dnsdist:250225.0.01 + image: docker-registry1.in.thelinuxpro.net:5000/tlp/dnsdist:250225.0.02 networks: dns_local_net: ipv4_address: 10.200.53.251 @@ -21,7 +21,7 @@ services: build: dockerfile: Dockerfile container_name: dnsdist2 - image: docker-registry1.in.thelinuxpro.net:5000/tlp/dnsdist:250225.0.01 + image: docker-registry1.in.thelinuxpro.net:5000/tlp/dnsdist:250225.0.02 networks: dns_local_net: ipv4_address: 10.200.53.252