Skip to content

Commit 2b549b8

Browse files
committed
ci: Bump trusted services in dockerfiles
Builds and uses 1.0.0 version of trusted services in docker files. Further commits updates the provider in parsec to use the new RPC APIs. Signed-off-by: Gowtham Suresh Kumar <[email protected]>
1 parent 8dc9be3 commit 2b549b8

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

e2e_tests/docker_image/parsec-service-test-all.Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,18 @@ ENV SPIFFE_ENDPOINT_SOCKET="unix:///tmp/agent.sock"
161161

162162
# Add safe.directory configuration to access repos freely
163163
RUN git config --global --add safe.directory '*'
164+
165+
# Install latest Trusted Services libraries. The previously installed
166+
# libraries are old and necessary for ./generate-keys.sh which uses
167+
# Parsec 1.0.0 version that is incompatible with newer libts APIs.
168+
RUN rm /usr/local/lib/libts.so* /usr/local/lib/libprotobuf-nanopb.a /usr/local/lib/libmbedcrypto.a
169+
RUN git clone https://git.trustedfirmware.org/TS/trusted-services.git --branch main \
170+
&& cd trusted-services \
171+
&& git reset --hard b27d4163e01065d1203bd71ffa6562a651f77a13
172+
# Install correct python dependencies
173+
RUN pip3 install -r trusted-services/requirements.txt
174+
RUN cd trusted-services/deployments/libts/linux-pc/ \
175+
&& cmake . \
176+
&& make \
177+
&& cp libts.so* nanopb_install/lib/libprotobuf-nanopb.a mbedtls_install/lib/libmbedcrypto.a /usr/local/lib/
178+
RUN rm -rf trusted-services

e2e_tests/docker_image/parsec-service-test-cross-compile.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ RUN rm aarch64-gcc.tar.xz
1111
# Setup git config for patching dependencies
1212
RUN git config --global user.email "[email protected]"
1313
RUN git config --global user.name "Parsec Team"
14-
RUN git clone https://git.trustedfirmware.org/TS/trusted-services.git --branch integration \
14+
RUN git clone https://git.trustedfirmware.org/TS/trusted-services.git --branch main \
1515
&& cd trusted-services \
16-
&& git reset --hard 389b50624f25dae860bbbf8b16f75b32f1589c8d
16+
&& git reset --hard b27d4163e01065d1203bd71ffa6562a651f77a13
1717
# Install correct python dependencies
1818
RUN pip3 install -r trusted-services/requirements.txt
1919
RUN cd trusted-services/deployments/libts/arm-linux/ \

0 commit comments

Comments
 (0)