Skip to content

Ensure the common usage of the OS_CA_CERT_SOURCE_PATH #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 6, 2025
+15 −9
Merged

Ensure the common usage of the OS_CA_CERT_SOURCE_PATH #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdd73e7
Ensure the common usage of the OS_CA_CERT_SOURCE_PATH when updating t…
rasmunk Jun 6, 2025
7f14a8d
Ensure that the OS_CA_CERT_SOURCE_PATH ARG is passed to the setup_mig…
rasmunk Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Dockerfile.centos7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,8 +755,9 @@ RUN mkdir -p MiG-certificates \
USER root
WORKDIR /tmp
# Copy in any external certificates that should be part of the OS trusted ca bundle
COPY external-certificates/ $OS_CA_CERT_SOURCE_PATH/
RUN update-ca-trust
RUN update-ca-trust force-enable
COPY external-certificates/ ${OS_CA_CERT_SOURCE_PATH}/
RUN update-ca-trust extract

WORKDIR $MIG_ROOT
USER $USER
Expand Down Expand Up @@ -1443,6 +1444,7 @@ ARG MIG_GIT_BRANCH
ARG ENABLE_QUOTA
ARG QUOTA_BACKEND
ARG QUOTA_LUSTRE_VERSION
ARG OS_CA_CERT_SOURCE_PATH

USER root

Expand Down Expand Up @@ -1595,7 +1597,7 @@ RUN mv $WEB_DIR/conf.d/autoindex.conf $WEB_DIR/conf.d/autoindex.conf.disabled \

# Add generated certificate to trust store
RUN update-ca-trust force-enable \
&& cp ${CERT_DIR}/combined.pem /etc/pki/ca-trust/source/anchors/ \
&& cp ${CERT_DIR}/combined.pem ${OS_CA_CERT_SOURCE_PATH}/ \
&& update-ca-trust extract

# rsyslog: Disable systemd and enable /dev/log
Expand Down
8 changes: 5 additions & 3 deletions Dockerfile.rocky8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,8 +771,9 @@ RUN mkdir -p MiG-certificates \
USER root
WORKDIR /tmp
# Copy in any external certificates that should be part of the OS trusted ca bundle
COPY external-certificates/ $OS_CA_CERT_SOURCE_PATH/
RUN update-ca-trust
RUN update-ca-trust force-enable
COPY external-certificates/ ${OS_CA_CERT_SOURCE_PATH}/
RUN update-ca-trust extract

WORKDIR $MIG_ROOT
USER $USER
Expand Down Expand Up @@ -1461,6 +1462,7 @@ ARG MIG_GIT_BRANCH
ARG ENABLE_QUOTA
ARG QUOTA_BACKEND
ARG QUOTA_LUSTRE_VERSION
ARG OS_CA_CERT_SOURCE_PATH

USER root

Expand Down Expand Up @@ -1619,7 +1621,7 @@ RUN mv $WEB_DIR/conf.d/autoindex.conf $WEB_DIR/conf.d/autoindex.conf.disabled \

# Add generated certificate to trust store
RUN update-ca-trust force-enable \
&& cp ${CERT_DIR}/combined.pem /etc/pki/ca-trust/source/anchors/ \
&& cp ${CERT_DIR}/combined.pem ${OS_CA_CERT_SOURCE_PATH}/ \
&& update-ca-trust extract

# rsyslog: Disable systemd and enable /dev/log
Expand Down
8 changes: 5 additions & 3 deletions Dockerfile.rocky9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,8 +728,9 @@ RUN mkdir -p MiG-certificates \
USER root
WORKDIR /tmp
# Copy in any external certificates that should be part of the OS trusted ca bundle
COPY external-certificates/ $OS_CA_CERT_SOURCE_PATH/
RUN update-ca-trust
RUN update-ca-trust force-enable
COPY external-certificates/ ${OS_CA_CERT_SOURCE_PATH}/
RUN update-ca-trust extract

WORKDIR $MIG_ROOT
USER $USER
Expand Down Expand Up @@ -1337,6 +1338,7 @@ ARG MIG_GIT_BRANCH
ARG ENABLE_QUOTA
ARG QUOTA_BACKEND
ARG QUOTA_LUSTRE_VERSION
ARG OS_CA_CERT_SOURCE_PATH

USER root

Expand Down Expand Up @@ -1493,7 +1495,7 @@ RUN mv $WEB_DIR/conf.d/autoindex.conf $WEB_DIR/conf.d/autoindex.conf.disabled \

# Add generated certificate to trust store
RUN update-ca-trust force-enable \
&& cp ${CERT_DIR}/combined.pem /etc/pki/ca-trust/source/anchors/ \
&& cp ${CERT_DIR}/combined.pem ${OS_CA_CERT_SOURCE_PATH}/ \
&& update-ca-trust extract

# rsyslog: Disable systemd and enable /dev/log
Expand Down