Merge pull request #19 from sonatype/main

[pull] main from sonatype:main
sonatype-nexus-community · Nov 7, 2024 · 2797d08 · 2797d08
2 parents 58aac2e + 1829fbf
commit 2797d08
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,8 +18,8 @@
 FROM registry.access.redhat.com/ubi9/openjdk-17:1.20-2
 
 # Build parameters
-ARG IQ_SERVER_VERSION=1.183.0-01
-ARG IQ_SERVER_SHA256=8d7b516b0611938f50b789998383bad741c05b475b5362e6ff7a7bd45e1889a6
+ARG IQ_SERVER_VERSION=1.184.0-01
+ARG IQ_SERVER_SHA256=92698a3b49378bd387b1bcff1ac64e1340c1f241a3eb918b5794a562185a68bd
 ARG TEMP="/tmp/work"
 ARG IQ_HOME="/opt/sonatype/nexus-iq-server"
 ARG SONATYPE_WORK="/sonatype-work"
@@ -33,7 +33,7 @@ LABEL name="Nexus IQ Server image" \
   maintainer="Sonatype <support@sonatype.com>" \
   vendor=Sonatype \
   version="${IQ_SERVER_VERSION}" \
-  release="1.183.0" \
+  release="1.184.0" \
   url="https://www.sonatype.com" \
   summary="The Nexus IQ Server" \
   description="Nexus IQ Server is a policy engine powered by precise intelligence on open source components. \

diff --git a/Dockerfile.slim b/Dockerfile.slim
@@ -16,8 +16,8 @@
 FROM registry.access.redhat.com/ubi9/openjdk-17:1.20-2
 
 # Build parameters
-ARG IQ_SERVER_VERSION=1.183.0-01
-ARG IQ_SERVER_SHA256=8d7b516b0611938f50b789998383bad741c05b475b5362e6ff7a7bd45e1889a6
+ARG IQ_SERVER_VERSION=1.184.0-01
+ARG IQ_SERVER_SHA256=92698a3b49378bd387b1bcff1ac64e1340c1f241a3eb918b5794a562185a68bd
 ARG TEMP="/tmp/work"
 ARG IQ_HOME="/opt/sonatype/nexus-iq-server"
 ARG SONATYPE_WORK="/sonatype-work"
@@ -31,7 +31,7 @@ LABEL name="Nexus IQ Server image" \
   maintainer="Sonatype <support@sonatype.com>" \
   vendor=Sonatype \
   version="${IQ_SERVER_VERSION}" \
-  release="1.183.0" \
+  release="1.184.0" \
   url="https://www.sonatype.com" \
   summary="The Nexus IQ Server" \
   description="Nexus IQ Server is a policy engine powered by precise intelligence on open source components. \

diff --git a/Jenkinsfile.rh.release b/Jenkinsfile.rh.release
@@ -34,15 +34,19 @@ node('ubuntu-zion') {
       env.IQ_SERVER_VERSION = getVersionFromBuildName(env.releaseBuild_NAME)
       env.IQ_SERVER_CHECKSUM = readBuildArtifact('insight/insight-brain/release', env.releaseBuild_NUMBER, "artifacts/nexus-iq-server-${env.IQ_SERVER_VERSION}-bundle.tar.gz.sha256").trim()
       env.IQ_RELEASE = env.IQ_SERVER_VERSION.split("-")[0]
+      env.PF_VERSION = sh( returnStdout: true, script:
+          "curl -L -H 'Accept: application/vnd.github+json' https://api.github.com/repos/redhat-openshift-ecosystem/openshift-preflight/git/refs/tags | jq -r '.[-1].ref' | cut -d'/' -f 3"
+          ).trim()
 
       deleteDir()
 
       checkout scm
 
       sh 'docker system prune -a -f'
       sh '''
+        echo "Downloading preflight ${PF_VERSION} ..."
         wget -q -O preflight \
-          https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/1.9.9/preflight-linux-amd64
+          https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/${PF_VERSION}/preflight-linux-amd64
         chmod 755 preflight
       '''
     }