summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYibo Cai <yibo.cai@arm.com>2018-06-14 16:23:47 +0800
committerYibo Cai <yibo.cai@arm.com>2018-06-14 16:57:29 +0800
commit60f3e7471202e2af220633cdb8137224287aced4 (patch)
tree5ca40830f9ebe0a6d1915f5b9fcb81af592d9e67
parent251c765df124ccd5d930d070a423a3bd6abff72c (diff)
arm64: fix concurrent building error
compass-tasks and compass-tasks-osa arm64 images are currently a simple wrap of compass-tasks-base image. The three images share one single image id, which causes concurrent building failure in releng task as one job will try to remove the built image while another job is still using the image with same id. Error logs: https://build.opnfv.org/ci/job/compass-tasks-osa-build-arm64-master/2/console This patch add another layer in compass-tasks and compass-tasks-osa to make sure they have different image id from compass-tasks-base. Change-Id: I0d8f299a3268322d043c22de7814cf5f87e3658e Signed-off-by: Yibo Cai <yibo.cai@arm.com>
-rw-r--r--compass-tasks-osa/Dockerfile-arm644
-rw-r--r--compass-tasks/Dockerfile-arm644
2 files changed, 6 insertions, 2 deletions
diff --git a/compass-tasks-osa/Dockerfile-arm64 b/compass-tasks-osa/Dockerfile-arm64
index 811d546..cb560b3 100644
--- a/compass-tasks-osa/Dockerfile-arm64
+++ b/compass-tasks-osa/Dockerfile-arm64
@@ -1,3 +1,5 @@
FROM opnfv/compass-tasks-base
+ARG BRANCH=master
-# TODO: support arm64
+ADD ./run.sh /root/
+# TODO
diff --git a/compass-tasks/Dockerfile-arm64 b/compass-tasks/Dockerfile-arm64
index 811d546..cb560b3 100644
--- a/compass-tasks/Dockerfile-arm64
+++ b/compass-tasks/Dockerfile-arm64
@@ -1,3 +1,5 @@
FROM opnfv/compass-tasks-base
+ARG BRANCH=master
-# TODO: support arm64
+ADD ./run.sh /root/
+# TODO