Skip to content

Commit

Permalink
ci: docker build all on same machine
Browse files Browse the repository at this point in the history
Signed-off-by: Vitor Bandeira <[email protected]>
  • Loading branch information
Vitor Bandeira committed Nov 14, 2024
1 parent 6ac045f commit 5eb04a4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
10 changes: 4 additions & 6 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,10 @@ timeout(time: 2, unit: 'HOURS') {
];
test_os.each { os ->
build_docker_images["Test Installer - ${os.name}"] = {
node {
checkout scm;
sh label: 'Build Docker image', script: "./etc/DockerHelper.sh create -target=builder -os=${os.image}";
sh label: 'Test Docker image', script: "./etc/DockerHelper.sh test -target=builder -os=${os.image}";
dockerPush("${os.image}", 'openroad');
}
checkout scm;
sh label: 'Build Docker image', script: "./etc/DockerHelper.sh create -target=builder -os=${os.image}";
sh label: 'Test Docker image', script: "./etc/DockerHelper.sh test -target=builder -os=${os.image}";
dockerPush("${os.image}", 'openroad');
}
}
parallel(build_docker_images);
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ RUN /tmp/DependencyInstaller.sh -common $INSTALLER_ARGS
RUN echo "$fromImage" | grep -q "ubuntu" && \
strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so || \
echo "Skipping strip command as fromImage does not contain 'ubuntu'"

RUN rm -f /tmp/DependencyInstaller.sh

0 comments on commit 5eb04a4

Please sign in to comment.