From e5b59207c2ab8a6c321477fc58c7df53dd7dedac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Mesureux?= <clement.mesureux@axa.fr>
Date: Tue, 26 Nov 2024 14:05:25 +0100
Subject: [PATCH] ci(images): use redhat base images

---
 api/Dockerfile            | 7 +++----
 job/dailyclean/Dockerfile | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index 16cc3ef..4b62c45 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM node:18-buster AS web
+FROM registry.access.redhat.com/ubi9/nodejs-22 AS web
 
 ENV \
     APP_ROOT=/app_root \
@@ -15,7 +15,7 @@ RUN npm ci
 RUN npm test -- --run
 RUN npm run build
 
-FROM registry.access.redhat.com/ubi9/ubi:9.1.0-1782 AS build
+FROM registry.access.redhat.com/ubi9/ubi:latest AS build
 
 ENV \
     APP_ROOT=/app_root \
@@ -82,7 +82,7 @@ COPY --chown=${USER} --from=web ${APP_ROOT}/dist ./src/main/resources/META-INF/r
 
 RUN mvn package -Pnative -B
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.1.0-1793 AS runtime
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS runtime
 
 ENV \
     APP_ROOT=/app_root \
@@ -96,4 +96,3 @@ EXPOSE 8080
 USER ${USER}
 
 CMD ["./application", "-Dquarkus.http.host=0.0.0.0", "-Xms40m", "-Xmx60m", "-Xmn20m"]
-
diff --git a/job/dailyclean/Dockerfile b/job/dailyclean/Dockerfile
index 6052ccb..a2be618 100644
--- a/job/dailyclean/Dockerfile
+++ b/job/dailyclean/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM registry.access.redhat.com/ubi8/ubi:8.5-200 as build
+FROM registry.access.redhat.com/ubi9/ubi:latest as build
 
 ENV \
   APP_ROOT=/opt/app-root \
@@ -18,13 +18,13 @@ RUN INSTALL_PKGS="python38 python38-devel python38-setuptools python38-pip gcc d
 RUN python3 -m pip install --compile --no-cache-dir --root ${APP_ROOT}/packages kubernetes
 RUN echo $(ls -1 ${APP_ROOT})
 
-FROM registry.access.redhat.com/ubi8-minimal:8.5-204 as run
+FROM registry.access.redhat.com/ubi9-minimal:latest as run
 
 ENV \
   APP_ROOT=/opt/app-root \
   # The $HOME is not set by default, but some applications needs this variable
   HOME=/opt/app-root \
-  PATH=/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin 
+  PATH=/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN INSTALL_PKGS="python38" && \
   microdnf -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \