From 841999e5ce29026d97de3d3c02afe10a9258486e Mon Sep 17 00:00:00 2001 From: Thirumalesh Aaraveti <97395760+athiruma@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:12:15 +0530 Subject: [PATCH] Changed the centos image to fedora, compatible to vm os image (#748) --- Docker/fedora-38-jenkins-slave/Dockerfile | 13 +++++++++++++ jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily | 3 ++- .../tenant/aws/ecoeng_01/TaggingJenkinsfileHourly | 2 +- jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily | 2 +- .../tenant/aws/ecoeng_02/TaggingJenkinsfileHourly | 2 +- jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily | 2 +- .../tenant/aws/ecoeng_03/TaggingJenkinsfileHourly | 2 +- 7 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 Docker/fedora-38-jenkins-slave/Dockerfile diff --git a/Docker/fedora-38-jenkins-slave/Dockerfile b/Docker/fedora-38-jenkins-slave/Dockerfile new file mode 100644 index 00000000..5e25bde6 --- /dev/null +++ b/Docker/fedora-38-jenkins-slave/Dockerfile @@ -0,0 +1,13 @@ + +# This image for Jenkins slave +# located: quay.io/athiru/fedora38-podman:latest +# run the postfix service within the container +# mount /etc/postfix/main.cf file to the container + +FROM quay.io/fedora/fedora:38 + +RUN dnf update -y && dnf install -y podman python3.9 git redis wget postfix +RUN printf "#!/bin/bash\npostfix start\ncat" > run.sh +RUN chmod 777 run.sh + +ENTRYPOINT ["/run.sh"] diff --git a/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily index 2b0a30e4..b014c9a9 100644 --- a/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily +++ b/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily @@ -6,7 +6,8 @@ pipeline { agent { docker { label 'haim-cloud-governance-worker' - image 'quay.io/athiru/centos-stream8-podman:latest' + image 'athiru/fedora38-podman:latest' + // Change based on the worker os args '-u root -v /etc/postfix/main.cf:/etc/postfix/main.cf --privileged' } } diff --git a/jenkins/tenant/aws/ecoeng_01/TaggingJenkinsfileHourly b/jenkins/tenant/aws/ecoeng_01/TaggingJenkinsfileHourly index 66c676b1..630577e6 100644 --- a/jenkins/tenant/aws/ecoeng_01/TaggingJenkinsfileHourly +++ b/jenkins/tenant/aws/ecoeng_01/TaggingJenkinsfileHourly @@ -6,7 +6,7 @@ pipeline { agent { docker { label 'haim-cloud-governance-worker' - image 'quay.io/athiru/centos-stream8-podman:latest' + image 'athiru/fedora38-podman:latest' args '-u root -v /etc/postfix/main.cf:/etc/postfix/main.cf --privileged' } } diff --git a/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily index 21204b4b..40148a81 100644 --- a/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily +++ b/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily @@ -8,7 +8,7 @@ pipeline { agent { docker { label 'haim-cloud-governance-worker' - image 'quay.io/athiru/centos-stream8-podman:latest' + image 'athiru/fedora38-podman:latest' args '-u root -v /etc/postfix/main.cf:/etc/postfix/main.cf --privileged' } } diff --git a/jenkins/tenant/aws/ecoeng_02/TaggingJenkinsfileHourly b/jenkins/tenant/aws/ecoeng_02/TaggingJenkinsfileHourly index 0a2b46d5..e17de839 100644 --- a/jenkins/tenant/aws/ecoeng_02/TaggingJenkinsfileHourly +++ b/jenkins/tenant/aws/ecoeng_02/TaggingJenkinsfileHourly @@ -6,7 +6,7 @@ pipeline { agent { docker { label 'haim-cloud-governance-worker' - image 'quay.io/athiru/centos-stream8-podman:latest' + image 'athiru/fedora38-podman:latest' args '-u root -v /etc/postfix/main.cf:/etc/postfix/main.cf --privileged' } } diff --git a/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily index 11b9f818..44d9fe3c 100644 --- a/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily +++ b/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily @@ -13,7 +13,7 @@ pipeline { agent { docker { label 'haim-cloud-governance-worker' - image 'quay.io/athiru/centos-stream8-podman:latest' + image 'athiru/fedora38-podman:latest' args '-u root -v /etc/postfix/main.cf:/etc/postfix/main.cf --privileged' } } diff --git a/jenkins/tenant/aws/ecoeng_03/TaggingJenkinsfileHourly b/jenkins/tenant/aws/ecoeng_03/TaggingJenkinsfileHourly index 973aa008..bae5a273 100644 --- a/jenkins/tenant/aws/ecoeng_03/TaggingJenkinsfileHourly +++ b/jenkins/tenant/aws/ecoeng_03/TaggingJenkinsfileHourly @@ -6,7 +6,7 @@ pipeline { agent { docker { label 'haim-cloud-governance-worker' - image 'quay.io/athiru/centos-stream8-podman:latest' + image 'athiru/fedora38-podman:latest' args '-u root -v /etc/postfix/main.cf:/etc/postfix/main.cf --privileged' } }