External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 05:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

resources: install swtpm from Jammy

Browse Source 
Jammy packages swtpm, install it and drop the steps for building it.

Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
This commit is contained in:
Praveen K Paladugu 2024-10-18 09:42:43 -05:00 committed by Rob Bradford
parent 9b14ee830a
commit b9bd80faa0
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
resources/Dockerfile
View File

@ -69,10 +69,7 @@ RUN update-alternatives --set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-
RUN if [ "$TARGETARCH" = "amd64" ]; then \ RUN if [ "$TARGETARCH" = "amd64" ]; then \
apt-get update \ apt-get update \
&& apt-get -yq upgrade \ && apt-get -yq upgrade \
&& apt-get install --no-install-recommends -yq gcc-multilib gawk \ && apt-get install --no-install-recommends -yq swtpm \
libtool expect gnutls-dev gnutls-bin libfuse-dev \
libjson-glib-dev libgmp-dev libtasn1-dev python3-twisted \
net-tools softhsm2 \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/*log /var/log/apt/* /var/lib/dpkg/*-old /var/cache/debconf/*-old; fi && rm -rf /var/lib/apt/lists/* /var/log/*log /var/log/apt/* /var/lib/dpkg/*-old /var/cache/debconf/*-old; fi
@ -145,26 +142,6 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
&& cp -rf ./python /usr/local/bin \ && cp -rf ./python /usr/local/bin \
&& cd .. && rm -rf spdk; fi && 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 # install ethr tool for performance tests
RUN if [ "$TARGETARCH" = "amd64" ]; then \ RUN if [ "$TARGETARCH" = "amd64" ]; then \
wget -nv https://github.com/microsoft/ethr/releases/latest/download/ethr_linux.zip \ wget -nv https://github.com/microsoft/ethr/releases/latest/download/ethr_linux.zip \