diff --git a/template/docker/Dockerfile.j2 b/template/docker/Dockerfile.j2 index 9e3fbcf9..9ad2a54e 100644 --- a/template/docker/Dockerfile.j2 +++ b/template/docker/Dockerfile.j2 @@ -13,12 +13,12 @@ # We want to automatically use the latest. We also don't tag our images with a version. # hadolint ignore=DL3007 -FROM oci.stackable.tech/sdp/ubi9-rust-builder:latest AS builder +FROM oci.stackable.tech/sdp/ubi10-rust-builder:latest AS builder # We want to automatically use the latest. # hadolint ignore=DL3007 -FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS operator +FROM registry.access.redhat.com/ubi10/ubi-minimal:latest AS operator ARG VERSION # NOTE (@Techassi): This is required for OpenShift/Red Hat certification @@ -74,7 +74,7 @@ LABEL org.opencontainers.image.description="Deploy and manage {[ operator.pretty # https://docs.openshift.com/container-platform/4.16/openshift_images/create-images.html#defining-image-metadata # https://github.com/projectatomic/ContainerApplicationGenericLabels/blob/master/vendor/redhat/labels.md -LABEL io.openshift.tags="ubi9,stackable,sdp,{[ operator.product_string }]" +LABEL io.openshift.tags="ubi10,stackable,sdp,{[ operator.product_string }]" LABEL io.k8s.description="Deploy and manage {[ operator.pretty_string }] clusters." LABEL io.k8s.display-name="Stackable Operator for {[ operator.pretty_string }]" diff --git a/template/nix/sources.json b/template/nix/sources.json index f79c2cf0..cd1ef311 100644 --- a/template/nix/sources.json +++ b/template/nix/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "kolloch", "repo": "crate2nix", - "rev": "be31feae9a82c225c0fd1bdf978565dc452a483a", - "sha256": "14d0ymlrwk7dynv35qcw4xn0dylfpwjmf6f8znflbk2l6fk23l12", + "rev": "26b698e804dd32dc5bb1995028fef00cc87d603a", + "sha256": "13jgy25yjd1m42xam6zri8vwx0n2qbwvpad2cmkhkrlx913n79ni", "type": "tarball", - "url": "https://github.com/kolloch/crate2nix/archive/be31feae9a82c225c0fd1bdf978565dc452a483a.tar.gz", + "url": "https://github.com/kolloch/crate2nix/archive/26b698e804dd32dc5bb1995028fef00cc87d603a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", - "sha256": "0h3gvjbrlkvxhbxpy01n603ixv0pjy19n9kf73rdkchdvqcn70j2", + "rev": "ea7f1f06811ce7fcc81d6c6fd4213150c23edcf2", + "sha256": "12q60q50gy65vnkkmn6lhhnh7wzidl9658y52d7digqbf58kwb8p", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a7fc11be66bdfb5cdde611ee5ce381c183da8386.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/ea7f1f06811ce7fcc81d6c6fd4213150c23edcf2.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }