Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): use mandrel-for-jdk21-rhel8 and use buildah with compute… #382

Merged
merged 1 commit into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
15 changes: 12 additions & 3 deletions .tekton/exhort-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions .tekton/exhort-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/Dockerfile.multi-stage
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading