Skip to content

Commit

Permalink
Generated commit to update templated files based on rev 39c6596 in st…
Browse files Browse the repository at this point in the history
…ackabletech/operator-templating repo. (#416)

Triggered by:
Manual run triggered by: lfrancke with message [Attempt to fix Dockerfiles]
  • Loading branch information
stackable-bot committed May 6, 2024
1 parent 7313f7d commit e93e3f4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: '0'
CARGO_PROFILE_DEV_DEBUG: '0'
RUST_TOOLCHAIN_VERSION: "1.77.0"
RUST_TOOLCHAIN_VERSION: "1.77.2"
RUSTFLAGS: "-D warnings"
RUSTDOCFLAGS: "-D warnings"
RUST_LOG: "info"
Expand Down
21 changes: 11 additions & 10 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# This file is automatically generated from the templates in stackabletech/operator-templating
# DON'T MANUALLY EDIT THIS FILE
# =============
FROM oci.stackable.tech/sdp/ubi8-rust-builder AS builder
FROM oci.stackable.tech/sdp/ubi9-rust-builder AS builder

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

ARG VERSION
ARG RELEASE="1"
Expand All @@ -17,14 +17,15 @@ LABEL name="Stackable Operator for Stackable Secret Operator" \
summary="Deploy and manage Stackable Secret Operator clusters." \
description="Deploy and manage Stackable Secret Operator clusters."

# Update image
RUN microdnf install -y yum \
&& yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical \
&& yum clean all \
&& microdnf clean all

# Install kerberos client libraries
RUN microdnf install -y krb5-libs libkadm5 && microdnf clean all
# Update image and install kerberos client libraries
# install_weak_deps in microdnf does not support the literal "False" as dnf does
# https://github.com/rpm-software-management/microdnf/blob/a600c62f29262d71a6259b70dc220df65a2ab9b5/dnf/dnf-main.c#L176-L189
RUN microdnf update -y --setopt=install_weak_deps=0 \
&& microdnf install -y --setopt=install_weak_deps=0 \
krb5-libs \
libkadm5 \
&& microdnf clean all \
&& rm -rf /var/cache/yum

COPY LICENSE /licenses/LICENSE

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.77.0"
channel = "1.77.2"

0 comments on commit e93e3f4

Please sign in to comment.