Skip to content
Open
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ buildscript {
javaSourceCompatibility = 8
}
ext['logback.version'] = '1.2.13'
ext['tomcat.version'] = '9.0.117'
ext['json-path.version'] = '2.10.0'
ext['json-smart.version'] = '2.6.0'
dependencies { classpath "com.blackduck.integration:common-gradle-plugin:${managedCgpVersion}" }

dependencies {
Expand Down Expand Up @@ -81,7 +84,7 @@ ext['log4j2.version'] = '2.16.0'

dependencies {

implementation 'com.blackduck.integration:hub-imageinspector-lib:15.0.4'
implementation 'com.blackduck.integration:hub-imageinspector-lib:15.0.5'

implementation 'org.springframework.boot:spring-boot-starter-web'
implementation("org.springframework.boot:spring-boot-starter-actuator")
Expand All @@ -99,6 +102,12 @@ dependencies {
testImplementation 'io.fabric8:kubernetes-model:2.0.8'
}

dependencyManagement {
imports {
mavenBom "com.fasterxml.jackson:jackson-bom:2.18.6"
}
}

// Prepare test config file
// System.getProperty("user.dir")
task buildKubeTestPodConfig(type: Copy) {
Expand All @@ -116,9 +125,10 @@ task createApkDockerfileTasks() {
task "create${linuxFlavorDirName}Dockerfile"(type: Dockerfile) {
destFile = project.file("${buildDir}/images/${linuxFlavorDirName}/${appName}/Dockerfile")
logger.lifecycle("destFile: ${destFile}")
from linuxFlavor
from 'artifactory.tools.duckutil.net:5010/blackduck.com/chainguard-base:latest'

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other changes seem fine to me, this one might be too, but I'm wondering if it has been tested further up before we merge to master. For example, do we know that the chainguard move works in hub-image inspector and better yet, in docker inspector?

user 'root'
exposePort 8080
runCommand 'apk update && apk add bash && apk add openjdk11-jre'
runCommand 'apk update && apk add bash && apk add openjdk-11-jre'
runCommand "mkdir -p ${imagePgmDir}/shared/target"
runCommand "mkdir -p ${imagePgmDir}/shared/output"
addFile("${appName}-${version}.jar", "${imagePgmDir}/${appName}.jar")
Expand Down