Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions dockerFiles/marklogic-deps-ubi9-arm:base
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ RUN microdnf -y upgrade glibc \
# hadolint ignore=DL3006,SC2086
RUN echo "NETWORKING=yes" > /etc/sysconfig/network \
&& microdnf -y install --setopt install_weak_deps=0 gdb python3-rpm nss libcap procps-ng python3 libtool-ltdl cpio initscripts tzdata glibc libstdc++ util-linux hostname ${PLATFORM_EXTRA_PACKAGES} \
&& sed -i '/eventlog/s/2775/0775/' /usr/lib/tmpfiles.d/tpm2-tss-fapi.conf \
&& grep -Eq '^[[:space:]]*d[[:space:]]+/run/tpm2-tss/eventlog[[:space:]]+0775[[:space:]]+tss[[:space:]]+tss' /usr/lib/tmpfiles.d/tpm2-tss-fapi.conf \
&& chmod a-s /run/tpm2-tss/eventlog \
&& microdnf clean all


Expand Down
3 changes: 3 additions & 0 deletions dockerFiles/marklogic-deps-ubi9:base
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ RUN microdnf -y upgrade glibc \
# hadolint ignore=DL3006,SC2086
RUN echo "NETWORKING=yes" > /etc/sysconfig/network \
&& microdnf -y install --setopt install_weak_deps=0 gdb python3-rpm nss libcap procps-ng python3 libtool-ltdl cpio initscripts tzdata glibc libstdc++ util-linux hostname ${PLATFORM_EXTRA_PACKAGES} \
&& sed -i '/eventlog/s/2775/0775/' /usr/lib/tmpfiles.d/tpm2-tss-fapi.conf \
&& grep -Eq '^[[:space:]]*d[[:space:]]+/run/tpm2-tss/eventlog[[:space:]]+0775[[:space:]]+tss[[:space:]]+tss' /usr/lib/tmpfiles.d/tpm2-tss-fapi.conf \
&& chmod a-s /run/tpm2-tss/eventlog \
&& microdnf clean all


Expand Down
6 changes: 6 additions & 0 deletions test/docker-tests.robot
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ D01 Smoke Test
[Documentation] Detailed scenario: Smoke Test.
... Covers setup, execution, and expected outcome validation for this scenario.
Create container with
IF 'ubi9' in '${IMAGE_TYPE}'
${container name}= Remove spaces from ${TEST NAME}
${result}= Run Process docker exec ${container name} find /run/tpm2-tss/eventlog -maxdepth 0 -perm /6000 -print -quit
Should Be Equal As Integers ${result.rc} 0 eventlog directory must exist
Should Be Empty ${result.stdout} eventlog directory must not have setuid/setgid bits
END
Docker log should contain *MARKLOGIC_INIT is set to false or not defined, not initializing.*
[Teardown] Delete container

Expand Down
Loading