Skip to content

Commit

Permalink
chore(jenkins): Use the non-legacy Dockerfile
Browse files Browse the repository at this point in the history 
Remove the last place where `Dockerfile-legacy` is used to prepare for
removing it. The use of the `Dockerfile` will cause the Jenkins pipeline
to run ORT as non-root, which is required in some scenarios.

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
  • Loading branch information
@sschuberth
sschuberth committed Apr 27, 2024
1 parent 4dd1612 commit 8942c43
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions integrations/jenkins/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ pipeline {
stage('Build ORT Docker image') {
agent {
dockerfile {
filename 'Dockerfile-legacy'
filename 'Dockerfile'
additionalBuildArgs getDockerBuildArgs()
args DOCKER_RUN_ARGS
}
Expand All @@ -377,7 +377,7 @@ pipeline {
stage('Clone project') {
agent {
dockerfile {
filename 'Dockerfile-legacy'
filename 'Dockerfile'
additionalBuildArgs getDockerBuildArgs()
args DOCKER_RUN_ARGS
}
Expand Down Expand Up @@ -416,7 +416,7 @@ pipeline {
stage('Clone ORT configuration') {
agent {
dockerfile {
filename 'Dockerfile-legacy'
filename 'Dockerfile'
additionalBuildArgs getDockerBuildArgs()
args DOCKER_RUN_ARGS
}
Expand Down Expand Up @@ -493,7 +493,7 @@ pipeline {
stage('Unstash ORT analyzer result') {
agent {
dockerfile {
filename 'Dockerfile-legacy'
filename 'Dockerfile'
additionalBuildArgs getDockerBuildArgs()
args DOCKER_RUN_ARGS
}
Expand Down Expand Up @@ -522,7 +522,7 @@ pipeline {
stage('Run ORT analyzer') {
agent {
dockerfile {
filename 'Dockerfile-legacy'
filename 'Dockerfile'
additionalBuildArgs getDockerBuildArgs()
args DOCKER_RUN_ARGS
}
Expand Down Expand Up @@ -619,7 +619,7 @@ pipeline {

agent {
dockerfile {
filename 'Dockerfile-legacy'
filename 'Dockerfile'
additionalBuildArgs getDockerBuildArgs()
args DOCKER_RUN_ARGS
}
Expand Down Expand Up @@ -749,7 +749,7 @@ pipeline {

agent {
dockerfile {
filename 'Dockerfile-legacy'
filename 'Dockerfile'
additionalBuildArgs getDockerBuildArgs()
args DOCKER_RUN_ARGS
}
Expand Down Expand Up @@ -812,7 +812,7 @@ pipeline {

agent {
dockerfile {
filename 'Dockerfile-legacy'
filename 'Dockerfile'
additionalBuildArgs getDockerBuildArgs()
args DOCKER_RUN_ARGS
}
Expand Down Expand Up @@ -883,7 +883,7 @@ pipeline {

agent {
dockerfile {
filename 'Dockerfile-legacy'
filename 'Dockerfile'
additionalBuildArgs getDockerBuildArgs()
args DOCKER_RUN_ARGS
}
Expand Down
2 changes: 1 addition & 1 deletion integrations/jenkins/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ After this run, there will be a new *Build with Parameters* entry in the job men
Clicking on it will show the job parameter form.
For a start, leave all the defaults and click on *Build* at the bottom.
This first run will take quite a long time in the "Build ORT Docker image" stage as the Docker image is built from scratch.
However, unless changes to `Dockerfile-legacy` are done, subsequent runs will be *much* faster.
However, unless changes to the `Dockerfile` are done, subsequent runs will be *much* faster.
Also, the "Run ORT scanner" stage will take a bit longer, but again subsequent scans will be faster thanks to the use of stored scan results.

Once the pipeline run completes you will see that the "Run ORT evaluator" stage is actually yellow and marked as "unstable".
Expand Down

0 comments on commit 8942c43

Please sign in to comment.