ContainerImages
/
jenkins-shared-libs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ContainerImages:397e54662c7797f3dda5b3bee3fdfbfd7f9f137a
Branches Tags
ContainerImages:bci2-resources
ContainerImages:main
ContainerImages:testing
..
compare: ContainerImages:83d694d6636997f225add134bb494ef3e9ad5e8c
Branches Tags
ContainerImages:bci2-resources
ContainerImages:main
ContainerImages:testing

No commits in common. "397e54662c7797f3dda5b3bee3fdfbfd7f9f137a" and "83d694d6636997f225add134bb494ef3e9ad5e8c" have entirely different histories.
397e54662c ... 83d694d663

1 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

10
vars/buildContainerImage2.groovy
View File

@ -53,7 +53,7 @@ def call(args) {
} }
parallel stages parallel stages
runInPod { runInPod() {
container('buildah') { container('buildah') {
withBuildahCreds(registry) { withBuildahCreds(registry) {
if (archlist.size() > 1) { if (archlist.size() > 1) {
@ -118,10 +118,10 @@ def runInPod(args, block) {
def tmpl = readYaml(text: podTemplateYaml) def tmpl = readYaml(text: podTemplateYaml)
tmpl.spec.containers.each { c -> tmpl.spec.containers.each { c ->
c.resources = c.resources ?: [:] c.resources = c.resources ?: [:]
c.resources.putAll([ c.resources.requests = c.resources.requests ?: [:]
requests: (c.resources.requests ?: [:]) + resources, c.resources.limits = c.resources.limits ?: [:]
limits: (c.resources.requests ?: [:]) + resources, c.resources.requests += resources
]) c.resources.limits += resources
} }
podTemplateYaml = writeYaml(data: tmpl, returnText: true) podTemplateYaml = writeYaml(data: tmpl, returnText: true)
echo podTemplateYaml echo podTemplateYaml