Skip to content

Commit b217d21

Browse files
committed
fix(images): Remove curl and add openssl for FIPS compliance
User request: Apply ubi-micro migration patterns from collector and StackRox PRs. Remove curl entirely from both Dockerfiles (compliance requirement) and keep changes small. Changes: - image/rhel/Dockerfile: Removed curl package and HEALTHCHECK that depended on curl (ACS compliance requirement) - image/rhel/konflux.Dockerfile: Removed curl, added openssl for FIPS support, added comment explaining Hermeto/Cachi2 reposdir behavior Follows patterns from: - stackrox/collector#3021 - #19379 OpenSSL requirement: stackrox/collector#3021 (comment) Note: Code changes were partially generated by AI assistance.
1 parent fdd7b3f commit b217d21

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

image/rhel/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ RUN dnf install -y \
4040
--nodocs \
4141
findutils \
4242
util-linux \
43-
ca-certificates \
44-
curl && \
43+
ca-certificates && \
4544
dnf --installroot=/out/ clean all && \
4645
rm -rf /out/var/cache/dnf /out/var/cache/yum
4746

@@ -124,5 +123,3 @@ EXPOSE 8443
124123
USER 4000:4000
125124

126125
ENTRYPOINT ["/stackrox/roxctl"]
127-
128-
HEALTHCHECK CMD curl --insecure --fail https://127.0.0.1:8443/v1/ping

image/rhel/konflux.Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ ARG PG_VERSION
4747
COPY --from=ubi-micro-base / /out/
4848

4949
# Install packages not in ubi-micro (bash and coreutils-single already present)
50+
# Note: --setopt=reposdir=/etc/yum.repos.d instructs dnf to use repo configurations pointing to RPMs
51+
# prefetched by Hermeto/Cachi2, instead of installroot's default UBI repos.
5052
RUN dnf install -y \
5153
--installroot=/out/ \
5254
--setopt=reposdir=/etc/yum.repos.d \
@@ -56,7 +58,7 @@ RUN dnf install -y \
5658
findutils \
5759
util-linux \
5860
ca-certificates \
59-
curl && \
61+
openssl && \
6062
dnf module enable -y \
6163
--installroot=/out/ \
6264
--setopt=reposdir=/etc/yum.repos.d \

0 commit comments

Comments
 (0)