summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/local-docker-compose.yaml5
-rw-r--r--docker/storperf-graphite/Dockerfile2
-rw-r--r--docker/storperf-httpfrontend/Dockerfile4
-rw-r--r--docker/storperf-master/Dockerfile2
-rw-r--r--docker/storperf-reporting/Dockerfile2
-rw-r--r--docker/storperf-swaggerui/Dockerfile4
6 files changed, 11 insertions, 8 deletions
diff --git a/docker/local-docker-compose.yaml b/docker/local-docker-compose.yaml
index 96afc1e..fa956ea 100644
--- a/docker/local-docker-compose.yaml
+++ b/docker/local-docker-compose.yaml
@@ -40,7 +40,10 @@ services:
storperf-graphite:
container_name: "storperf-graphite"
- build: storperf-graphite
+ build:
+ context: storperf-graphite
+ args:
+ ARCH: ${ARCH}
volumes:
- ${CARBON_DIR}:/opt/graphite/storage/whisper
diff --git a/docker/storperf-graphite/Dockerfile b/docker/storperf-graphite/Dockerfile
index b566458..2bea2c8 100644
--- a/docker/storperf-graphite/Dockerfile
+++ b/docker/storperf-graphite/Dockerfile
@@ -14,7 +14,7 @@
# From https://github.com/SchweizerischeBundesbahnen/docker-graphite
-ARG ARCH=x86_64
+ARG ARCH
ARG ALPINE_VERSION=v3.5
FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
diff --git a/docker/storperf-httpfrontend/Dockerfile b/docker/storperf-httpfrontend/Dockerfile
index eaf1ec5..b37943f 100644
--- a/docker/storperf-httpfrontend/Dockerfile
+++ b/docker/storperf-httpfrontend/Dockerfile
@@ -12,8 +12,8 @@
# $ docker build -t opnfv/storperf-frontend:tag .
##
-ARG ARCH=x86_64
-ARG ALPINE_VERSION=v3.5
+ARG ARCH
+ARG ALPINE_VERSION=v3.6
FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
# This comes from https://github.com/nginxinc/docker-nginx/blob/14c1b938737cf4399a6bb039bc506957dce562ae/stable/alpine/Dockerfile
diff --git a/docker/storperf-master/Dockerfile b/docker/storperf-master/Dockerfile
index eaaf811..38bd231 100644
--- a/docker/storperf-master/Dockerfile
+++ b/docker/storperf-master/Dockerfile
@@ -15,7 +15,7 @@
# $ docker build -t opnfv/storperf-master:tag .
#
-ARG ARCH=x86_64
+ARG ARCH
ARG ALPINE_VERSION=v3.6
FROM multiarch/alpine:$ARCH-$ALPINE_VERSION as storperf-builder
diff --git a/docker/storperf-reporting/Dockerfile b/docker/storperf-reporting/Dockerfile
index ac507a6..6f20e7b 100644
--- a/docker/storperf-reporting/Dockerfile
+++ b/docker/storperf-reporting/Dockerfile
@@ -15,7 +15,7 @@
##
-ARG ARCH=x86_64
+ARG ARCH
ARG ALPINE_VERSION=v3.6
FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
MAINTAINER Mark Beierl <mark.beierl@dell.com>
diff --git a/docker/storperf-swaggerui/Dockerfile b/docker/storperf-swaggerui/Dockerfile
index 8904246..9795c47 100644
--- a/docker/storperf-swaggerui/Dockerfile
+++ b/docker/storperf-swaggerui/Dockerfile
@@ -12,7 +12,7 @@
# $ docker build -t opnfv/storperf-swaggerui:tag .
##
-ARG ARCH=x86_64
+ARG ARCH
ARG ALPINE_VERSION=v3.6
FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
@@ -116,4 +116,4 @@ ADD run.sh run.sh
# webserver port
EXPOSE 80
-CMD ["sh", "run.sh"] \ No newline at end of file
+CMD ["sh", "run.sh"]