Skip to content

Commit

Permalink
resources: install swtpm from Jammy
Browse files Browse the repository at this point in the history
Jammy packages swtpm, install it and drop the steps for building it.

Signed-off-by: Praveen K Paladugu <[email protected]>
  • Loading branch information
praveen-pk committed Oct 18, 2024
1 parent 2fa4dc6 commit c7157d9
Showing 1 changed file with 1 addition and 24 deletions.
25 changes: 1 addition & 24 deletions resources/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,7 @@ RUN update-alternatives --set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-
RUN if [ "$TARGETARCH" = "amd64" ]; then \
apt-get update \
&& apt-get -yq upgrade \
&& apt-get install --no-install-recommends -yq gcc-multilib gawk \
libtool expect gnutls-dev gnutls-bin libfuse-dev \
libjson-glib-dev libgmp-dev libtasn1-dev python3-twisted \
net-tools softhsm2 \
&& apt-get install --no-install-recommends -yq gcc-multilib swtpm \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/*log /var/log/apt/* /var/lib/dpkg/*-old /var/cache/debconf/*-old; fi

Expand Down Expand Up @@ -145,26 +142,6 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
&& cp -rf ./python /usr/local/bin \
&& cd .. && rm -rf spdk; fi

# install swtpm only for x86_64 arch
# hadolint ignore=DL3003
RUN if [ "$TARGETARCH" = "amd64" ]; then \
git clone https://github.com/stefanberger/libtpms libtpms_build \
&& cd libtpms_build \
&& git checkout v0.8.8 \
&& ./autogen.sh \
&& make \
&& make install \
&& cd .. \
&& git clone https://github.com/stefanberger/swtpm swtpm_build \
&& cd swtpm_build \
&& git checkout v0.8.0 \
&& ./autogen.sh \
&& make \
&& make install \
&& cd .. \
&& ldconfig \
&& rm -rf swtpm_build libtpms_build; fi

# install ethr tool for performance tests
RUN if [ "$TARGETARCH" = "amd64" ]; then \
wget -nv https://github.com/microsoft/ethr/releases/latest/download/ethr_linux.zip \
Expand Down

0 comments on commit c7157d9

Please sign in to comment.