From de09799887339c5af02d96e20bb417fa65dbc8d1 Mon Sep 17 00:00:00 2001 From: Taseer Ahmed Date: Fri, 4 Aug 2017 10:45:35 +0500 Subject: Support for Docker images on ARM processors. - Usage: docker build --build-arg ARCH= . Change-Id: I9018c627cef05e69492dbdefbe750d72cf98064d Signed-off-by: Taseer Ahmed --- docker-compose/create-compose.py | 8 ++++++-- docker-compose/docker-compose.yaml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'docker-compose') diff --git a/docker-compose/create-compose.py b/docker-compose/create-compose.py index 7f971f1..da71f69 100644 --- a/docker-compose/create-compose.py +++ b/docker-compose/create-compose.py @@ -29,7 +29,7 @@ services: storperf-swaggerui: container_name: "storperf-swaggerui" - image: "schickling/swagger-ui" + image: "opnfv/storperf-swaggerui:{swaggerui_tag}" storperf-httpfrontend: container_name: "storperf-httpfrontend" @@ -51,6 +51,9 @@ assert isinstance(reporting_tag, str) frontend_tag = input("Enter image TAG for frontend: ") or 'latest' assert isinstance(frontend_tag, str) +swaggerui_tag = input("Enter image TAG for swaggerui: ") or 'latest' +assert isinstance(swaggerui_tag, str) + env_file = input("Enter path to environment file: ") assert isinstance(env_file, str) if env_file == '': @@ -65,6 +68,7 @@ if carbon_dir == '': f = open('docker-compose.yaml', 'w') f.write(content.format(storperf_tag=storeperf_tag, reporting_tag=reporting_tag, - frontend_tag=frontend_tag, CARBON_DIR=carbon_dir, ENV_FILE=env_file)) + frontend_tag=frontend_tag, swaggerui_tag=swaggerui_tag, + CARBON_DIR=carbon_dir, ENV_FILE=env_file)) f.close() diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index bb09eef..e9459c4 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -26,7 +26,7 @@ services: storperf-swaggerui: container_name: "storperf-swaggerui" - image: "schickling/swagger-ui" + image: "opnfv/storperf-swaggerui:${TAG}" storperf-httpfrontend: container_name: "storperf-httpfrontend" -- cgit 1.2.3-korg