diff --git a/dockerFiles/marklogic-deps-ubi9-arm:base b/dockerFiles/marklogic-deps-ubi9-arm:base index 531cbd31..bac8dfe1 100644 --- a/dockerFiles/marklogic-deps-ubi9-arm:base +++ b/dockerFiles/marklogic-deps-ubi9-arm:base @@ -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 diff --git a/dockerFiles/marklogic-deps-ubi9:base b/dockerFiles/marklogic-deps-ubi9:base index 0a0c0bfb..d654d081 100644 --- a/dockerFiles/marklogic-deps-ubi9:base +++ b/dockerFiles/marklogic-deps-ubi9:base @@ -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 diff --git a/test/docker-tests.robot b/test/docker-tests.robot index 34b7d4ff..e6c0b887 100644 --- a/test/docker-tests.robot +++ b/test/docker-tests.robot @@ -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