Merge branch 'openshift:main' into OCPBUGS-12857-Gracefully-Handle-Na…

…N-In-Dashboards

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.21-openshift-4.16
+  tag: rhel-9-release-golang-1.21-openshift-4.16

Dockerfile.art

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-openshift-nodejs-base-4.16.art AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.16 AS builder
 
 # Copy app sources
 COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
@@ -23,12 +23,10 @@ RUN test -d ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps || exit 1; \
  && source ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps/cachito.env \
  && yarn && yarn build
 
-FROM registry.ci.openshift.org/ocp/4.16:base
+FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
 
-ENV NGINX_VERSION=1.20
-RUN yum -y module enable nginx:$NGINX_VERSION && \
-    INSTALL_PKGS="nginx" && \
-    yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+RUN INSTALL_PKGS="nginx" && \
+    dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum -y clean all --enablerepo='*' && \
     chown -R 1001:0 /var/lib/nginx /var/log/nginx /run && \

package.json

@@ -92,7 +92,8 @@
   "resolutions": {
     "webpack": "^5.76.0",
     "tough-cookie": "^4.1.3",
-    "semver": "^6.3.1"
+    "semver": "^6.3.1",
+    "sanitize-html": "^2.12.1"
   },
   "consolePlugin": {
     "name": "monitoring-plugin",