Skip to content

Commit 196d492

Browse files
committed
Merge remote-tracking branch 'origin/main' into chore/sdp-26.3.0
2 parents a8586eb + a5688e0 commit 196d492

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

template/.github/workflows/build.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
set -euo pipefail
140140
[ -n "$GITHUB_DEBUG" ] && set -x
141141

142-
CURRENT_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
142+
CURRENT_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "stackable-{[ operator.name }]") | .version')
143143

144144
if [ "$GITHUB_EVENT_NAME" == 'pull_request' ]; then
145145
# Include a PR suffix if this workflow is triggered by a PR

template/docker/Dockerfile.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
# We want to automatically use the latest. We also don't tag our images with a version.
1515
# hadolint ignore=DL3007
16-
FROM oci.stackable.tech/sdp/ubi9-rust-builder:latest AS builder
16+
FROM oci.stackable.tech/sdp/ubi10-rust-builder:latest AS builder
1717

1818

1919
# We want to automatically use the latest.
2020
# hadolint ignore=DL3007
21-
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS operator
21+
FROM registry.access.redhat.com/ubi10/ubi-minimal:latest AS operator
2222

2323
ARG VERSION
2424
# NOTE (@Techassi): This is required for OpenShift/Red Hat certification
@@ -74,7 +74,7 @@ LABEL org.opencontainers.image.description="Deploy and manage {[ operator.pretty
7474

7575
# https://docs.openshift.com/container-platform/4.16/openshift_images/create-images.html#defining-image-metadata
7676
# https://github.com/projectatomic/ContainerApplicationGenericLabels/blob/master/vendor/redhat/labels.md
77-
LABEL io.openshift.tags="ubi9,stackable,sdp,{[ operator.product_string }]"
77+
LABEL io.openshift.tags="ubi10,stackable,sdp,{[ operator.product_string }]"
7878
LABEL io.k8s.description="Deploy and manage {[ operator.pretty_string }] clusters."
7979
LABEL io.k8s.display-name="Stackable Operator for {[ operator.pretty_string }]"
8080

template/nix/sources.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)