From 9e0d1209f00ce8e1dc7c9cb33134afddc88ad050 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Mon, 6 May 2024 14:29:46 +0000 Subject: [PATCH] Generated commit to update templated files based on rev d200484 in stackabletech/operator-templating repo. Triggered by: Manual run triggered by: lfrancke with message [Update dockerfiles] --- .github/workflows/build.yml | 2 +- docker/Dockerfile | 19 +++++++++---------- rust-toolchain.toml | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa57ce58..fcaea2a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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" diff --git a/docker/Dockerfile b/docker/Dockerfile index f2ba8213..bf2e9b78 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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" @@ -17,14 +17,13 @@ LABEL name="Stackable Operator for Apache Hive" \ summary="Deploy and manage Apache Hive clusters." \ description="Deploy and manage Apache Hive 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 +RUN microdnf update -y --setopt=install_weak_deps=False \ + && microdnf install -y --setopt=install_weak_deps=False \ + krb5-libs \ + libkadm5 \ + && microdnf clean all \ + && rm -rf /var/cache/yum COPY LICENSE /licenses/LICENSE diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 83025f97..6f14058b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.77.0" +channel = "1.77.2"