build.sh: Consistently add ${DOCKER_SUFFIX} for images built
This follows the change previously done to bionic-amd64-tf-m-build,
and will allow to properly namespace sanity-check images and preclude
them leaking into production image namespace (TFC-220).
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I1fdfac7d9ba7f320eac91a1a9a63277f85d96c7d
diff --git a/alpine-amd64-node10-tf-a/build.sh b/alpine-amd64-node10-tf-a/build.sh
index e876f5e..3ec158a 100755
--- a/alpine-amd64-node10-tf-a/build.sh
+++ b/alpine-amd64-node10-tf-a/build.sh
@@ -4,6 +4,6 @@
export LANG=C
-image=trustedfirmware/ci-node-tf-a-alpine:alpine10
+image=trustedfirmware/ci-node-tf-a-alpine:alpine10${DOCKER_SUFFIX}
docker build --pull --tag=$image .
echo $image > .docker-tag
diff --git a/bionic-amd64-hafnium/build.sh b/bionic-amd64-hafnium/build.sh
index 1e2137d..391907b 100755
--- a/bionic-amd64-hafnium/build.sh
+++ b/bionic-amd64-hafnium/build.sh
@@ -17,6 +17,6 @@
cp -a ../setup-sshd .
-image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}
+image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}${DOCKER_SUFFIX}
docker build --pull --tag=$image .
echo $image > .docker-tag
diff --git a/bionic-amd64-mbed-tls-build/build.sh b/bionic-amd64-mbed-tls-build/build.sh
index 969c66c..e68ebfb 100755
--- a/bionic-amd64-mbed-tls-build/build.sh
+++ b/bionic-amd64-mbed-tls-build/build.sh
@@ -15,6 +15,6 @@
ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
PROJECT=$(basename ${PWD} | cut -f3 -d '-')-$(basename ${PWD} | cut -f4 -d '-')
-image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}
+image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}${DOCKER_SUFFIX}
docker build --pull --tag=$image .
echo $image > .docker-tag
diff --git a/bionic-amd64-tf-a-build/build.sh b/bionic-amd64-tf-a-build/build.sh
index d2bf20c..8e267a2 100755
--- a/bionic-amd64-tf-a-build/build.sh
+++ b/bionic-amd64-tf-a-build/build.sh
@@ -17,6 +17,6 @@
cp -a ../setup-sshd .
-image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}
+image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}${DOCKER_SUFFIX}
docker build --pull --tag=$image .
echo $image > .docker-tag
diff --git a/bullseye-amd64-tf-m-qemu/build.sh b/bullseye-amd64-tf-m-qemu/build.sh
index 59a10db..8577b11 100755
--- a/bullseye-amd64-tf-m-qemu/build.sh
+++ b/bullseye-amd64-tf-m-qemu/build.sh
@@ -8,6 +8,6 @@
ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
PROJECT=$(basename ${PWD} | cut -d'-' -f3-)
-image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-debian:${DISTRIBUTION}
+image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-debian:${DISTRIBUTION}${DOCKER_SUFFIX}
docker build --pull --tag=$image .
echo $image > .docker-tag
diff --git a/centos8-amd64-flexnet/build.sh b/centos8-amd64-flexnet/build.sh
index f028483..986c5df 100755
--- a/centos8-amd64-flexnet/build.sh
+++ b/centos8-amd64-flexnet/build.sh
@@ -14,6 +14,6 @@
DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
-image=trustedfirmware/flexnet
+image=trustedfirmware/flexnet${DOCKER_SUFFIX}
docker build --pull --tag=$image .
echo $image > .docker-tag
diff --git a/focal-amd64-fvp-test/build.sh b/focal-amd64-fvp-test/build.sh
index b6409dd..a898a61 100755
--- a/focal-amd64-fvp-test/build.sh
+++ b/focal-amd64-fvp-test/build.sh
@@ -15,5 +15,5 @@
ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
PROJECT=$(basename ${PWD} | cut -f4 -d '-')
-image=fvp:${ARCHITECTURE}-${PROJECT}-ubuntu-${DISTRIBUTION}
+image=fvp:${ARCHITECTURE}-${PROJECT}-ubuntu-${DISTRIBUTION}${DOCKER_SUFFIX}
docker build --pull --tag=$image .
diff --git a/focal-amd64-mbed-tls-host/build.sh b/focal-amd64-mbed-tls-host/build.sh
index c026dbf..6516905 100755
--- a/focal-amd64-mbed-tls-host/build.sh
+++ b/focal-amd64-mbed-tls-host/build.sh
@@ -11,6 +11,6 @@
export LANG=C
-image=trustedfirmware/ci-amd64-mbed-tls-ubuntu-host:focal
+image=trustedfirmware/ci-amd64-mbed-tls-ubuntu-host:focal${DOCKER_SUFFIX}
docker build --pull --tag=$image .
echo $image > .docker-tag
diff --git a/jessie-amd64-jenkins-master/build.sh b/jessie-amd64-jenkins-master/build.sh
index de9e3c7..42aac8c 100755
--- a/jessie-amd64-jenkins-master/build.sh
+++ b/jessie-amd64-jenkins-master/build.sh
@@ -4,6 +4,6 @@
export LANG=C
-image=trustedfirmware/ci-x86_64-jenkins-master-debian:lts
+image=trustedfirmware/ci-x86_64-jenkins-master-debian:lts${DOCKER_SUFFIX}
docker build --pull --tag=$image .
echo $image > .docker-tag
diff --git a/xenial-amd64-mbed-tls-build/build.sh b/xenial-amd64-mbed-tls-build/build.sh
index 969c66c..e68ebfb 100755
--- a/xenial-amd64-mbed-tls-build/build.sh
+++ b/xenial-amd64-mbed-tls-build/build.sh
@@ -15,6 +15,6 @@
ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
PROJECT=$(basename ${PWD} | cut -f3 -d '-')-$(basename ${PWD} | cut -f4 -d '-')
-image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}
+image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}${DOCKER_SUFFIX}
docker build --pull --tag=$image .
echo $image > .docker-tag