Skip to content

Commit a6ae770

Browse files
committed
ci: Update FIH docker to Ubuntu Jammy (22.04)
- Ubuntu Jammy brings CMake 3.22.1 required by newer TFM builds. - Python requirements were updated following requirements in TFM. - Added git configuration to ignore repo ownership checks (since 2.35.3). Signed-off-by: Fabio Utzig <utzig@apache.org>
1 parent 242db1a commit a6ae770

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

ci/fih_test_docker/docker-build/Dockerfile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM ubuntu:focal
15+
FROM ubuntu:jammy
1616

17-
# get dependencies for retrieving and building TF-M with MCUBoot, and QEMU.
17+
# Get dependencies for retrieving and building TF-M with MCUBoot, and QEMU.
1818
RUN apt-get update && \
1919
DEBIAN_FRONTEND="noninteractive" \
2020
apt-get install -y \
@@ -26,18 +26,20 @@ RUN apt-get update && \
2626
libncurses5 \
2727
python3 \
2828
python3-pip \
29-
qemu-system-arm
29+
qemu-system-arm \
30+
file &&\
31+
apt-get clean all
3032

31-
RUN \
32-
# installing python packages
33-
python3 -m pip install \
34-
imgtool==1.7.0 \
35-
Jinja2==2.10 \
36-
PyYAML==3.12 \
37-
pyasn1==0.1.9
33+
# Installing python packages
34+
RUN python3 -m pip install \
35+
imgtool>=1.9.0 \
36+
Jinja2>=2.10.3 \
37+
PyYAML \
38+
pyasn1
3839

39-
# Add tfm work directory
40-
RUN mkdir -p /root/work/tfm
40+
# Add tfm work directory && get rid of spurious git ownership errors
41+
RUN mkdir -p /root/work/tfm &&\
42+
git config --global --add safe.directory '*'
4143

4244
# run the command
4345
CMD ["bash"]

0 commit comments

Comments
 (0)