commit 8ab727f8909f6699ba0f9c3bc197800fbf49b4b8
author Nicola Mazzucato <nicola.mazzucato@arm.com> Fri Apr 19 13:48:05 2024 +0100
committer Paul Sokolovsky <paul.sokolovsky@linaro.org> Tue Sep 10 16:16:55 2024 +0200
tree fabdc34cbdbc0ccf6f6832112c502b5cb4a63620
parent 853b7268c34828e8adab36840fc1895a1b7bce6f

jammy-amd64-tf-m-build: Add build option for local running containers

The current build script build.sh works well in the CI environment, but
not for a local machine.
Introduce 'base-ci' and 'base-local' build stages and introduce a build
option for the build script to indicate the build is for "local".

If no build option is provided, the build script performs as before:
build.sh      -> STANDARD/CI BUILD
build.sh -l   -> LOCAL BUILD/TESTS

Change-Id: If201a91170f65dbc072e9c65fe65e1da6ba945b5
Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com>

jammy-amd64-tf-m-build/Dockerfile

diff --git a/jammy-amd64-tf-m-build/Dockerfile b/jammy-amd64-tf-m-build/Dockerfile
index 37a313e..589b46a 100644
--- a/jammy-amd64-tf-m-build/Dockerfile
+++ b/jammy-amd64-tf-m-build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:jammy AS base
 
 # Environment variables used by CI scripts
 ENV ARMLMD_LICENSE_FILE=27000@flexnet.trustedfirmware.org
@@ -109,6 +109,7 @@
     apt clean ;\
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+FROM base AS base-ci
 USER buildslave
 
 RUN set -e ;\
@@ -121,3 +122,6 @@
 
 EXPOSE 22
 ENTRYPOINT ["/usr/sbin/setup-sshd"]
+
+FROM base AS base-local
+ENV PATH="${PATH}:/home/buildslave/compiler/gcc-11-2/bin"