From cdb9e502e696ff3219be5b9bac8b5c0b702cbca8 Mon Sep 17 00:00:00 2001 From: Kameron Kenny <1267885+kkenny@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:05:05 -0400 Subject: [PATCH] Add tests to Jenkinsfile --- Dockerfile | 2 +- Jenkinsfile | 1 + docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 778c110..09b146c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:latest MAINTAINER Kameron Kenny -LABEL version="20241030095015" +LABEL version="20241030100505" LABEL description="Debian Based syslog-ng" RUN apt-get update diff --git a/Jenkinsfile b/Jenkinsfile index 498becc..3ef96ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { stage("Test syslog-ng configuration") { steps { sh '/usr/sbin/syslog-ng -s -f config/syslog-ng.conf --no-caps' + sh 'for i in `ls -1 config/syslog-ng.conf.d/*.conf`; do /usr/sbin/syslog-ng -s -f config/syslog-ng.conf.d/${i} --no-caps; done' } } diff --git a/docker-compose.yml b/docker-compose.yml index 80183eb..ca0f161 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: syslog-ng: build: dockerfile: Dockerfile - image: docker-registry1.in.thelinuxpro.net:5000/tlp/syslog-ng:20241030095015 + image: docker-registry1.in.thelinuxpro.net:5000/tlp/syslog-ng:20241030100505 container_name: syslog-ng restart: unless-stopped networks: