From f9ef28fa24e22ef0ebdd9e6d5db826153760a8fe Mon Sep 17 00:00:00 2001 From: Filip Valder Date: Mar 13 2019 15:04:52 +0000 Subject: Use f29 for Freshmaker image builds --- diff --git a/Dockerfile b/Dockerfile index e0b8b44..911154a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:28 +FROM fedora:29 LABEL \ name="Freshmaker application" \ vendor="Freshmaker developers" \ @@ -11,7 +11,7 @@ COPY $freshmaker_rpm /tmp RUN cd /etc/yum.repos.d/ \ && dnf -v -y install 'dnf-command(config-manager)' \ - && dnf config-manager --add-repo http://download-ipv4.eng.brq.redhat.com/rel-eng/RCMTOOLS/latest-RCMTOOLS-2-F-28/compose/Everything/x86_64/os/ \ + && dnf config-manager --add-repo http://download-ipv4.eng.brq.redhat.com/rel-eng/RCMTOOLS/latest-RCMTOOLS-2-F-29/compose/Everything/x86_64/os/ \ && dnf -y clean all \ && dnf -v --nogpg -y install \ httpd mod_wsgi mod_auth_gssapi python2-rhmsg mod_ssl \ diff --git a/Jenkinsfile b/Jenkinsfile index 9a749f6..47e84ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -89,6 +89,8 @@ if ("${env.JOB_NAME}" != 'freshmaker-prs') { node('docker') { stage('Build Docker container') { checkout scm + // Remember to reflect the version change in the Dockerfile in the future. + sh 'grep -q "FROM fedora:29" Dockerfile' unarchive mapping: ['mock-result/f29/': '.'] def f29_rpm = findFiles(glob: 'mock-result/f29/**/*.noarch.rpm')[0] def appversion = sh(returnStdout: true, script: """