#374 Use f29 for Freshmaker image builds
Merged 6 months ago by jkaluza. Opened 6 months ago by fivaldi.
fivaldi/freshmaker fivaldi_f29_dockerfile  into  master

file modified
+2 -2

@@ -1,4 +1,4 @@ 

- FROM fedora:28

+ FROM fedora:29

  LABEL \

      name="Freshmaker application" \

      vendor="Freshmaker developers" \

@@ -11,7 +11,7 @@ 

  

  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 \

file modified
+2

@@ -89,6 +89,8 @@ 

  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: """

@jkaluza Please for review, as discussed.

rebased onto f9ef28f

6 months ago

+1, let's try running that on freshmaker-dev.

Pull-Request has been merged by jkaluza

6 months ago