Skip to content

Commit

Permalink
ci(images): use redhat base images
Browse files Browse the repository at this point in the history
  • Loading branch information
clement-mesureux committed Nov 26, 2024
1 parent 9f975fc commit e5b5920
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
7 changes: 3 additions & 4 deletions api/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -96,4 +96,3 @@ EXPOSE 8080
USER ${USER}

CMD ["./application", "-Dquarkus.http.host=0.0.0.0", "-Xms40m", "-Xmx60m", "-Xmn20m"]

6 changes: 3 additions & 3 deletions job/dailyclean/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 && \
Expand Down

0 comments on commit e5b5920

Please sign in to comment.