Skip to content

Commit 9e85253

Browse files
authored
dependobot alerts (#134)
1 parent de49061 commit 9e85253

File tree

7 files changed

+174
-135
lines changed

7 files changed

+174
-135
lines changed

.github/workflows/onpullrequest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Setup Python
5353
uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
5454
with:
55-
python-version: '3.8.10'
55+
python-version: '3.9'
5656

5757
- name: Install Poetry
5858
run: pip install poetry==1.7.1

inteltrustauthorityclient/examples/.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
###########################################
66

77
# Ubuntu base image version
8-
UBUNTU_VERSION=20.04
8+
UBUNTU_VERSION=22.04
99

1010
# Trust Authority Client version
1111
# Change this value for release
1212
TRUST_AUTHORITY_CLIENT_VERSION=v1.1.0
1313

1414
# Intel SGX sdk version variables
15-
DCAP_VERSION=1.19.100.3-focal1
15+
DCAP_VERSION=1.19.100.3-jammy1
1616
PSW_VERSION=2.22.100.3
1717

1818
# Adapter selection
19-
# Change this to sgx/aztdx/nvgpu as per the need to build the correct image.
19+
# Change this to sgx/aztdx/tdx/nvgpu as per the need to build the correct image.
2020
ADAPTER_TYPE=tdx

inteltrustauthorityclient/examples/sgx_sample_app/Dockerfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,26 @@ ARG ADAPTER_TYPE
3939
ENV ADAPTER_TYPE=${ADAPTER_TYPE}
4040
RUN apt update && apt install -y --no-install-recommends gnupg wget python3 pip build-essential
4141

42-
# Adding SGX repo to Ubuntu focal
43-
RUN echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main' > /etc/apt/sources.list.d/intel-sgx.list && \
44-
wget https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key -O /tmp/intel-sgx-deb.key && \
45-
apt-key add /tmp/intel-sgx-deb.key && \
46-
rm /tmp/intel-sgx-deb.key
42+
# Adding SGX repo to Ubuntu jammy
43+
RUN echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
44+
wget https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key && apt-key add intel-sgx-deb.key && cat intel-sgx-deb.key | tee /etc/apt/keyrings/intelsgx-keyring.asc > /dev/null
4745

4846
WORKDIR /opt/intel
4947
# Download SGX SDK binary
50-
RUN /bin/bash -c "set -o pipefail && wget -q https://download.01.org/intel-sgx/sgx-linux/2.22/distro/ubuntu20.04-server/sgx_linux_x64_sdk_${PSW_VERSION}.bin && \
48+
RUN /bin/bash -c "set -o pipefail && wget -q https://download.01.org/intel-sgx/sgx-linux/2.22/distro/ubuntu22.04-server/sgx_linux_x64_sdk_${PSW_VERSION}.bin && \
5149
chmod +x sgx_linux_x64_sdk_${PSW_VERSION}.bin && \
5250
echo 'yes' | ./sgx_linux_x64_sdk_${PSW_VERSION}.bin"
5351

5452
# Installing Linux SGX SDK
5553
RUN apt-get update && apt-get install -y --no-install-recommends \
56-
libsgx-urts=${PSW_VERSION}-focal1 \
54+
libsgx-urts=${PSW_VERSION}-jammy1 \
5755
libsgx-qe3-logic=${DCAP_VERSION} \
5856
libsgx-pce-logic=${DCAP_VERSION} \
5957
libsgx-dcap-ql=${DCAP_VERSION} \
6058
libsgx-dcap-ql-dev=${DCAP_VERSION} \
6159
libcurl4-openssl-dev \
6260
libsgx-dcap-default-qpl=${DCAP_VERSION} \
63-
libsgx-quote-ex=${PSW_VERSION}-focal1
61+
libsgx-quote-ex=${PSW_VERSION}-jammy1
6462

6563
COPY --from=build_base /app/dist/applications_security_amber_trustauthority_client_for_python-1.1.0-py3-none-any.whl .
6664
RUN pip install applications_security_amber_trustauthority_client_for_python-1.1.0-py3-none-any.whl

inteltrustauthorityclient/examples/sgx_sample_app/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ The Intel SGX attestation sample application can be encapsulated as a container,
9191

9292
```sh
9393
cat <<EOF | tee .env
94-
UBUNTU_VERSION=20.04
94+
UBUNTU_VERSION=22.04
9595
TRUST_AUTHORITY_CLIENT_VERSION=v1.1.0
96-
DCAP_VERSION=1.19.100.3-focal1
96+
DCAP_VERSION=1.19.100.3-jammy1
9797
PSW_VERSION=2.22.100.3
9898
ADAPTER_TYPE="sgx"
9999
EOF

inteltrustauthorityclient/examples/tdx_sample_app/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The Intel TDX attestation sample can be encapsulated as a container, enabling it
8888

8989
```sh
9090
cat <<EOF | tee .env
91-
UBUNTU_VERSION=24.04
91+
UBUNTU_VERSION=22.04
9292
TRUST_AUTHORITY_CLIENT_VERSION=v1.1.0
9393
EOF
9494

0 commit comments

Comments
 (0)