From 89b45e9509a163b6622acca3d0ab0a9a0f66a15a Mon Sep 17 00:00:00 2001 From: Ruben Romero Montes Date: Tue, 19 Nov 2024 16:28:05 +0100 Subject: [PATCH] chore(deps): use mandrel-for-jdk21-rhel8 and use buildah with compute resources Signed-off-by: Ruben Romero Montes --- .tekton/exhort-pull-request.yaml | 15 ++++++++++++--- .tekton/exhort-push.yaml | 13 +++++++++++-- src/main/docker/Dockerfile.multi-stage | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.tekton/exhort-pull-request.yaml b/.tekton/exhort-pull-request.yaml index df7e3a24..fb2b72cf 100644 --- a/.tekton/exhort-pull-request.yaml +++ b/.tekton/exhort-pull-request.yaml @@ -29,6 +29,15 @@ spec: value: src/main/docker/Dockerfile.jvm.staged - name: path-context value: . + taskRunSpecs: + - pipelineTaskName: build-container + stepSpecs: + - name: build + computeResources: + requests: + memory: 8Gi + limits: + memory: 8Gi pipelineSpec: description: | This pipeline is ideal for building container images from a Containerfile while reducing network traffic. @@ -239,11 +248,11 @@ spec: runAfter: - prefetch-dependencies taskRef: - params: + params: - name: name - value: buildah-8gb + value: buildah - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-8gb:0.2@sha256:976128cdd109b87bb758e2b77dff5a1cb261fdeb9d280b937b1c67860d829786 + value: quay.io/konflux-ci/tekton-catalog/task-buildah@sha256:d588db7bfd8cd0b951de7f7a3929ba5870e8ab1e35bd45056d03fd9c2972fcf1 - name: kind value: task resolver: bundles diff --git a/.tekton/exhort-push.yaml b/.tekton/exhort-push.yaml index 1118e0d2..b4a95204 100644 --- a/.tekton/exhort-push.yaml +++ b/.tekton/exhort-push.yaml @@ -27,6 +27,15 @@ spec: value: src/main/docker/Dockerfile.jvm.staged - name: path-context value: . + taskRunSpecs: + - pipelineTaskName: build-container + stepSpecs: + - name: build + computeResources: + requests: + memory: 8Gi + limits: + memory: 8Gi pipelineSpec: description: | This pipeline is ideal for building container images from a Containerfile while reducing network traffic. @@ -239,9 +248,9 @@ spec: taskRef: params: - name: name - value: buildah-8gb + value: buildah - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-8gb:0.2@sha256:976128cdd109b87bb758e2b77dff5a1cb261fdeb9d280b937b1c67860d829786 + value: quay.io/konflux-ci/tekton-catalog/task-buildah@sha256:d588db7bfd8cd0b951de7f7a3929ba5870e8ab1e35bd45056d03fd9c2972fcf1 - name: kind value: task resolver: bundles diff --git a/src/main/docker/Dockerfile.multi-stage b/src/main/docker/Dockerfile.multi-stage index 777a104a..6d6a4513 100644 --- a/src/main/docker/Dockerfile.multi-stage +++ b/src/main/docker/Dockerfile.multi-stage @@ -1,5 +1,5 @@ ## Stage 1 : build with maven builder image with native capabilities -FROM registry.redhat.io/quarkus/mandrel-23-rhel8:23.0 AS build +FROM registry.redhat.io/quarkus/mandrel-for-jdk-21-rhel8:23.1 AS build COPY --chown=quarkus:quarkus mvnw /code/mvnw COPY --chown=quarkus:quarkus .mvn /code/.mvn