Compare commits

..

No commits in common. "24dd3f256a70484a1e75015421b821c55fcb1244" and "78e6993156f09685bb0df7d5aacbe6464fb8d309" have entirely different histories.

3 changed files with 5 additions and 5 deletions

View File

@ -8,5 +8,5 @@ EXPOSE 53/tcp 53/udp
COPY dnsdist.conf /etc/dnsdist/dnsdist.conf COPY dnsdist.conf /etc/dnsdist/dnsdist.conf
ENTRYPOINT ["/usr/bin/dnsdist", "--uid", "dnsdist", "--gid", "dnsdist"] ENTRYPOINT ["/usr/local/bin/dnsdist", "--uid", "dnsdist", "--gid", "dnsdist"]
CMD ["--supervised"] CMD ["--supervised"]

4
Jenkinsfile vendored
View File

@ -71,7 +71,7 @@ pipeline {
def status = sh(returnStatus: true, script: 'grep $(docker --context pi503 compose ps | tail -n1 | awk \'{ print $2 }\') docker-compose.yml') def status = sh(returnStatus: true, script: 'grep $(docker --context pi503 compose ps | tail -n1 | awk \'{ print $2 }\') docker-compose.yml')
if (status != 0) { if (status != 0) {
sh 'docker --context pi503 compose up dnsdist1 -d' sh 'docker --context pi503 compose up -d'
sh 'docker --context pi503 compose ps' sh 'docker --context pi503 compose ps'
sh 'sleep 3' sh 'sleep 3'
sh 'docker --context pi503 compose logs' sh 'docker --context pi503 compose logs'
@ -88,7 +88,7 @@ pipeline {
def status = sh(returnStatus: true, script: 'grep $(docker --context pi502 compose ps | tail -n1 | awk \'{ print $2 }\') docker-compose.yml') def status = sh(returnStatus: true, script: 'grep $(docker --context pi502 compose ps | tail -n1 | awk \'{ print $2 }\') docker-compose.yml')
if (status != 0) { if (status != 0) {
sh 'docker --context pi502 compose up dnsdist2 -d' sh 'docker --context pi502 compose up -d'
sh 'docker --context pi502 compose ps' sh 'docker --context pi502 compose ps'
sh 'sleep 3' sh 'sleep 3'
sh 'docker --context pi502 compose logs' sh 'docker --context pi502 compose logs'

View File

@ -8,7 +8,7 @@ services:
build: build:
dockerfile: Dockerfile dockerfile: Dockerfile
container_name: dnsdist1 container_name: dnsdist1
image: docker-registry1.in.thelinuxpro.net:5000/tlp/dnsdist:250224.0.02 image: docker-registry1.in.thelinuxpro.net:5000/tlp/dnsdist:250224.0.01
networks: networks:
dns_local_net: dns_local_net:
ipv4_address: 10.200.53.251 ipv4_address: 10.200.53.251
@ -21,7 +21,7 @@ services:
build: build:
dockerfile: Dockerfile dockerfile: Dockerfile
container_name: dnsdist2 container_name: dnsdist2
image: docker-registry1.in.thelinuxpro.net:5000/tlp/dnsdist:250224.0.02 image: docker-registry1.in.thelinuxpro.net:5000/tlp/dnsdist:250224.0.01
networks: networks:
dns_local_net: dns_local_net:
ipv4_address: 10.200.53.252 ipv4_address: 10.200.53.252