File tree Expand file tree Collapse file tree 2 files changed +0
-25
lines changed
osbuilder/rootfs-builder/ubuntu
packaging/static-build/coco-guest-components Expand file tree Collapse file tree 2 files changed +0
-25
lines changed Original file line number Diff line number Diff line change @@ -28,24 +28,6 @@ suite=$OS_VERSION
2828packages=$PACKAGES $EXTRA_PKGS
2929EOF
3030
31- if [ " ${CONFIDENTIAL_GUEST} " == " yes" ] && [ " ${DEB_ARCH} " == " amd64" ]; then
32- mkdir -p $rootfs_dir /etc/apt/trusted.gpg.d/
33- curl -fsSL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key |
34- gpg --dearmour -o $rootfs_dir /etc/apt/trusted.gpg.d/intel-sgx-deb.gpg
35- sed -i -e " s/bootstrap=Ubuntu/bootstrap=Ubuntu intel-sgx/" $multistrap_conf
36- SUITE=$OS_VERSION
37- # Intel does not release sgx stuff for non-LTS, thus if using oracular (24.10),
38- # we need to enforce getting libtdx-attest from noble.
39- [ " $SUITE " = " oracular" ] && SUITE=" noble"
40- cat >> $multistrap_conf << EOF
41-
42- [intel-sgx]
43- source=https://download.01.org/intel-sgx/sgx_repo/ubuntu
44- suite=$SUITE
45- packages=libtdx-attest=1.22\*
46- EOF
47- fi
48-
4931 # This fixes the spurious error
5032 # E: Can't find a source to download version '2021.03.26' of 'ubuntu-keyring:amd64'
5133 apt update
Original file line number Diff line number Diff line change @@ -12,7 +12,6 @@ ENV RUSTUP_HOME="/opt/rustup"
1212ENV CARGO_HOME="/opt/cargo"
1313ENV PATH="/opt/cargo/bin/:${PATH}"
1414
15- # Note - the TDX lib is only available on x86, so there is an arch check in the package install
1615SHELL ["/bin/bash" , "-o" , "pipefail" , "-c" ]
1716
1817RUN mkdir ${RUSTUP_HOME} ${CARGO_HOME} && chmod -R a+rwX ${RUSTUP_HOME} ${CARGO_HOME}
@@ -21,12 +20,6 @@ RUN apt-get update && \
2120 apt-get --no-install-recommends install -y \
2221 ca-certificates \
2322 curl \
24- gnupg && \
25- if [ "$(uname -m)" == "x86_64" ]; then curl -sL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg && \
26- echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
27- apt-get update && \
28- apt-get --no-install-recommends -y install libtdx-attest-dev; fi && \
29- apt-get --no-install-recommends -y install \
3023 binutils \
3124 clang \
3225 g++ \
You can’t perform that action at this time.
0 commit comments