Skip to content

[WIP] konflux: use RHAI base image #1074

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.

Sign up for GitHub

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

Open
raptorsun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] konflux: use RHAI base image #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .tekton/lightspeed-stack-pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ spec:
value: 'true'
- name: dockerfile
value: Containerfile
- name: build-args-file
value: build-args-konflux.conf
pipelineSpec:
description: |
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
Expand Down
2 changes: 2 additions & 0 deletions .tekton/lightspeed-stack-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ spec:
value: 'true'
- name: dockerfile
value: Containerfile
- name: build-args-file
value: build-args-konflux.conf
pipelineSpec:
description: |
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
Expand Down
7 changes: 5 additions & 2 deletions Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# vim: set filetype=dockerfile
ARG RUNTIME_BASE_IMAGE=registry.access.redhat.com/ubi9/python-312-minimal
ARG RUNTIME_DNF_COMMAND=microdnf

FROM registry.access.redhat.com/ubi9/python-312 AS builder

ARG APP_ROOT=/app-root
Expand Down Expand Up @@ -51,7 +54,7 @@ RUN if [ -f /cachi2/cachi2.env ]; then \
RUN uv pip uninstall ecdsa

# Final image without uv package manager
FROM registry.access.redhat.com/ubi9/python-312-minimal
FROM ${RUNTIME_BASE_IMAGE}
ARG APP_ROOT=/app-root
WORKDIR /app-root

Expand Down Expand Up @@ -79,7 +82,7 @@ COPY --from=builder /app-root/LICENSE /licenses/
USER root

# Additional tools for derived images
RUN microdnf install -y --nodocs --setopt=keepcache=0 --setopt=tsflags=nodocs jq patch libpq libtiff openjpeg2 lcms2 libjpeg-turbo libwebp
RUN ${RUNTIME_DNF_COMMAND} install -y --nodocs --setopt=keepcache=0 --setopt=tsflags=nodocs jq patch

# Create llama-stack directories for library mode
RUN mkdir -p /opt/app-root/src/.llama/storage /opt/app-root/src/.llama/providers.d && \
Expand Down
2 changes: 2 additions & 0 deletions build-args-konflux.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
RUNTIME_BASE_IMAGE=registry.redhat.io/rhai/base-image-cpu-rhel9:3.2
RUNTIME_DNF_COMMAND=dnf
Loading