ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-18 02:39:56 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[# 153] Update TPM 2.0 emulator docker image with latest PACCOR (#158)

Browse Source 
* Updating PACCOR for docker images.

* Updating PACCOR for docker images.

* Clean up Dockerfiles.

* Updated docker images to use PACCOR 1.1.2-1
This commit is contained in:
busaboy1340 2019-06-12 10:38:57 -04:00 committed by GitHub
parent e69bb48799
commit a00be77d5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.ci/docker/Dockerfile.tpm2provisioner
View File

@ -2,11 +2,10 @@ FROM hirs/hirs-ci:centos7
# Install packages for installing HIRS TPM2 Provisioner
RUN yum -y update && yum clean all
# TODO: Remove vim-common if/when Paccor updates (Also update Paccor version below)
RUN yum install -y tpm2-tools libcurl procps-ng vim-common wget dbus python-requests && yum clean all
RUN yum install -y tpm2-tools libcurl procps-ng wget dbus python-requests && yum clean all
# Install PACCOR for Device Info Gathering
RUN mkdir paccor && pushd paccor && wget https://github.com/nsacyber/paccor/releases/download/v1.0.6r3/paccor-1.0.6-3.noarch.rpm && yum -y install paccor-*.rpm && popd
RUN mkdir paccor && pushd paccor && wget https://github.com/nsacyber/paccor/releases/download/v1.1.2r1/paccor-1.1.2-1.noarch.rpm && yum -y install paccor-*.rpm && popd
# Install Software TPM for Provisioning
RUN mkdir ibmtpm && pushd ibmtpm && wget https://downloads.sourceforge.net/project/ibmswtpm2/ibmtpm1119.tar.gz && tar -zxvf ibmtpm1119.tar.gz && cd src && make -j5 && popd

5
.ci/docker/Dockerfile.tpmprovisioner
View File

@ -2,14 +2,13 @@ FROM hirs/hirs-ci:centos7
# Install packages for installing HIRS TPM Provisioner
RUN yum -y update && yum clean all
# TODO: Remove vim-common if/when Paccor updates (Also update Paccor version below)
RUN yum install -y java-1.8.0-openjdk wget util-linux chkconfig sed systemd gmp-devel coreutils dmidecode bash autoconf autoconf-archive automake libtool pkgconfig m4 gcc-c++ openssl python-requests && yum clean all
# Install tpm_module for Communicating with TPM
RUN mkdir tpm_module && pushd tpm_module && wget https://github.com/nsacyber/HIRS/releases/download/v1.0.2/tpm_module-1.0.2-1541093721.d1bdf9.x86_64.rpm && yum -y install tpm_module-*.rpm && popd
RUN mkdir tpm_module && pushd tpm_module && wget https://github.com/nsacyber/HIRS/releases/download/v1.0.4/tpm_module-1.0.4-1558547257.cedc93.x86_64.rpm && yum -y install tpm_module-*.rpm && popd
# Install PACCOR for Device Info Gathering
RUN mkdir paccor && pushd paccor && wget https://github.com/nsacyber/paccor/releases/download/v1.0.6r3/paccor-1.0.6-3.noarch.rpm && yum -y install paccor-*.rpm && popd
RUN mkdir paccor && pushd paccor && wget https://github.com/nsacyber/paccor/releases/download/v1.1.2r1/paccor-1.1.2-1.noarch.rpm && yum -y install paccor-*.rpm && popd
# Install Software TPM for Provisioning
RUN mkdir tpm_emulator && pushd tpm_emulator && wget https://phoenixnap.dl.sourceforge.net/project/ibmswtpm/tpm4769tar.gz && tar -xzvf tpm4769tar.gz && pushd libtpm && ./autogen && ./configure && make && popd && pushd tpm && make -f makefile-tpm && popd && popd

2
.ci/system-tests/run-system-tests-tpm2.sh
View File

@ -21,7 +21,7 @@ echo "TPM2 Container Status: $tpm2_container_status"
while [[ $tpm2_container_status == "running" ]]
do
sleep 10
sleep 20
# Add status message, so Travis will not time out.
# It may timeout if it hasn't received output for more than 10 minutes.

2
.ci/system-tests/run-system-tests.sh
View File

@ -21,7 +21,7 @@ echo "TPM Container Status: $tpm_container_status"
while [[ $tpm_container_status == "running" ]]
do
sleep 10
sleep 20
# Add status message, so Travis will not time out.
# It may timeout if it hasn't received output for more than 10 minutes.