Skip to content

Commit 51551f0

Browse files
committed
Generated commit to update templated files based on rev 39c6596 in stackabletech/operator-templating repo.
Triggered by: Manual run triggered by: lfrancke with message [Attempt to fix Dockerfiles]
1 parent 95961bd commit 51551f0

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
CARGO_TERM_COLOR: always
2222
CARGO_INCREMENTAL: '0'
2323
CARGO_PROFILE_DEV_DEBUG: '0'
24-
RUST_TOOLCHAIN_VERSION: "1.77.0"
24+
RUST_TOOLCHAIN_VERSION: "1.77.2"
2525
RUSTFLAGS: "-D warnings"
2626
RUSTDOCFLAGS: "-D warnings"
2727
RUST_LOG: "info"

docker/Dockerfile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# This file is automatically generated from the templates in stackabletech/operator-templating
33
# DON'T MANUALLY EDIT THIS FILE
44
# =============
5-
FROM oci.stackable.tech/sdp/ubi8-rust-builder AS builder
5+
FROM oci.stackable.tech/sdp/ubi9-rust-builder AS builder
66

7-
FROM registry.access.redhat.com/ubi8/ubi-minimal AS operator
7+
FROM registry.access.redhat.com/ubi9/ubi-minimal AS operator
88

99
ARG VERSION
1010
ARG RELEASE="1"
@@ -17,14 +17,15 @@ LABEL name="Stackable Operator for Apache ZooKeeper" \
1717
summary="Deploy and manage Apache ZooKeeper clusters." \
1818
description="Deploy and manage Apache ZooKeeper clusters."
1919

20-
# Update image
21-
RUN microdnf install -y yum \
22-
&& yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical \
23-
&& yum clean all \
24-
&& microdnf clean all
25-
26-
# Install kerberos client libraries
27-
RUN microdnf install -y krb5-libs libkadm5 && microdnf clean all
20+
# Update image and install kerberos client libraries
21+
# install_weak_deps in microdnf does not support the literal "False" as dnf does
22+
# https://github.com/rpm-software-management/microdnf/blob/a600c62f29262d71a6259b70dc220df65a2ab9b5/dnf/dnf-main.c#L176-L189
23+
RUN microdnf update -y --setopt=install_weak_deps=0 \
24+
&& microdnf install -y --setopt=install_weak_deps=0 \
25+
krb5-libs \
26+
libkadm5 \
27+
&& microdnf clean all \
28+
&& rm -rf /var/cache/yum
2829

2930
COPY LICENSE /licenses/LICENSE
3031

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.77.0"
2+
channel = "1.77.2"

0 commit comments

Comments
 (0)