From 544285aae942427a68570a4e8c279efe3fbb3631 Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Tue, 27 Oct 2026 20:30:24 +0000 Subject: [PATCH] Update CA certificates in devspace images --- docker/Dockerfile | 4 ++++ jenkins/Dockerfile | 7 +++++++ nginx/Dockerfile | 4 ++++ server/Dockerfile | 4 ++++ slave/Dockerfile | 4 ++++ web/Dockerfile | 4 ++++ 6 files changed, 27 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index c7d3a8b1..f7ba5a01 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,6 +4,10 @@ LABEL org.opencontainers.image.authors="OME" USER root +RUN dnf -y upgrade ca-certificates \ + && update-ca-trust \ + && dnf clean all + RUN dnf -y install -y yum-utils \ device-mapper-persistent-data \ diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index b48f1938..96cf3b0b 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -1,4 +1,11 @@ FROM jenkins/jenkins:lts-jdk21 + +USER root +RUN apt-get update \ + && apt-get install -y --only-upgrade ca-certificates \ + && dpkg-query -W -f='${Version}\n' ca-certificates \ + && rm -rf /var/lib/apt/lists/* + LABEL org.opencontainers.image.authors="OME" # Temp fix robot test results diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 6b538923..d056cedd 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -2,6 +2,10 @@ FROM openmicroscopy/devagent:0.8.2 LABEL org.opencontainers.image.authors="OME" +RUN dnf -y upgrade ca-certificates \ + && update-ca-trust \ + && dnf clean all + COPY nginx-stable.repo /etc/yum.repos.d/ RUN dnf -y install dnf-utils RUN yum-config-manager --enable nginx-stable diff --git a/server/Dockerfile b/server/Dockerfile index 999f5128..80b6a9d6 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -2,6 +2,10 @@ FROM openmicroscopy/devagent:0.8.2 LABEL org.opencontainers.image.authors="OME" +RUN dnf -y upgrade ca-certificates \ + && update-ca-trust \ + && dnf clean all + ADD ./settings.env /home/settings.env RUN chmod +x /home/settings.env diff --git a/slave/Dockerfile b/slave/Dockerfile index 1f833e00..28a50e8b 100644 --- a/slave/Dockerfile +++ b/slave/Dockerfile @@ -2,6 +2,10 @@ FROM openmicroscopy/devagent:0.8.2 LABEL org.opencontainers.image.authors="OME" +RUN dnf -y upgrade ca-certificates \ + && update-ca-trust \ + && dnf clean all + ARG NAME=ome ARG GRADLEVER=6.9.3 diff --git a/web/Dockerfile b/web/Dockerfile index 12ce2f84..e8f9e2e1 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -2,6 +2,10 @@ FROM openmicroscopy/devagent:0.8.2 LABEL org.opencontainers.image.authors="OME" +RUN dnf -y upgrade ca-certificates \ + && update-ca-trust \ + && dnf clean all + ADD ./settings.env /home/settings.env RUN chmod +x /home/settings.env