- Usage: docker build --build-arg ARCH=<arch_type> .
Change-Id: I9018c627cef05e69492dbdefbe750d72cf98064d
Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
sudo chown 33:33 ${ci}/job/carbon
fi
+if [ -z $ARCH ]
+then
+ ARCH=x86_64
+fi
+
+export ARCH
+
docker-compose -f local-docker-compose.yaml build
docker-compose -f local-docker-compose.yaml up -d
storperf-swaggerui:
container_name: "storperf-swaggerui"
- image: "schickling/swagger-ui"
+ image: "opnfv/storperf-swaggerui:{swaggerui_tag}"
storperf-httpfrontend:
container_name: "storperf-httpfrontend"
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 == '':
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()
storperf-swaggerui:
container_name: "storperf-swaggerui"
- image: "schickling/swagger-ui"
+ image: "opnfv/storperf-swaggerui:${TAG}"
storperf-httpfrontend:
container_name: "storperf-httpfrontend"
storperf-master:
container_name: "storperf-master"
- build: storperf-master
+ build:
+ context: storperf-master
+ args:
+ ARCH: ${ARCH}
ports:
- "8000:8000"
env_file: ${ENV_FILE}
storperf-reporting:
container_name: "storperf-reporting"
- build: storperf-reporting
- ports:
- - "5080:5000"
+ build:
+ context: storperf-reporting
+ args:
+ ARCH: ${ARCH}
volumes:
- ./storperf-reporting/:/home/opnfv/storperf-reporting
storperf-swaggerui:
container_name: "storperf-swaggerui"
- image: "schickling/swagger-ui"
+ build:
+ context: storperf-swaggerui
+ args:
+ ARCH: ${ARCH}
storperf-httpfrontend:
container_name: "storperf-httpfrontend"
- build: storperf-httpfrontend
+ build:
+ context: storperf-httpfrontend
+ args:
+ ARCH: ${ARCH}
ports:
- "5000:5000"
links:
# $ docker build -t opnfv/storperf-frontend:tag .
##
+ARG ARCH=x86_64
+ARG ALPINE_VERSION=v3.5
+FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
-FROM nginx:stable-alpine
-MAINTAINER Mark Beierl <mark.beierl@dell.com>
-LABEL version="3.1" description="OPNFV Storperf HTTP Front End Container"
+# This comes from https://github.com/nginxinc/docker-nginx/blob/14c1b938737cf4399a6bb039bc506957dce562ae/stable/alpine/Dockerfile
+# Is is cloned here so that we can use multiarch alpine
+
+MAINTAINER NGINX Docker Maintainers "docker-maint@nginx.com"
+
+ENV NGINX_VERSION 1.8.1
+
+ENV GPG_KEYS B0F4253373F8F6F510D42178520A9993A1C052F8
+ENV CONFIG "\
+ --prefix=/etc/nginx \
+ --sbin-path=/usr/sbin/nginx \
+ --conf-path=/etc/nginx/nginx.conf \
+ --error-log-path=/var/log/nginx/error.log \
+ --http-log-path=/var/log/nginx/access.log \
+ --pid-path=/var/run/nginx.pid \
+ --lock-path=/var/run/nginx.lock \
+ --http-client-body-temp-path=/var/cache/nginx/client_temp \
+ --http-proxy-temp-path=/var/cache/nginx/proxy_temp \
+ --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \
+ --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \
+ --http-scgi-temp-path=/var/cache/nginx/scgi_temp \
+ --user=nginx \
+ --group=nginx \
+ --with-http_ssl_module \
+ --with-http_realip_module \
+ --with-http_addition_module \
+ --with-http_sub_module \
+ --with-http_dav_module \
+ --with-http_flv_module \
+ --with-http_mp4_module \
+ --with-http_gunzip_module \
+ --with-http_gzip_static_module \
+ --with-http_random_index_module \
+ --with-http_secure_link_module \
+ --with-http_stub_status_module \
+ --with-http_auth_request_module \
+ --with-mail \
+ --with-mail_ssl_module \
+ --with-file-aio \
+ --with-http_spdy_module \
+ --with-ipv6 \
+ "
+
+RUN \
+ addgroup -S nginx \
+ && adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
+ && apk add --no-cache --virtual .build-deps \
+ gcc \
+ libc-dev \
+ make \
+ openssl-dev \
+ pcre-dev \
+ zlib-dev \
+ linux-headers \
+ curl \
+ gnupg \
+ && gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$GPG_KEYS" \
+ && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -o nginx.tar.gz \
+ && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc -o nginx.tar.gz.asc \
+ && gpg --verify nginx.tar.gz.asc \
+ && mkdir -p /usr/src \
+ && tar -zxC /usr/src -f nginx.tar.gz \
+ && rm nginx.tar.gz* \
+ && rm -r /root/.gnupg \
+ && cd /usr/src/nginx-$NGINX_VERSION \
+ && ./configure $CONFIG --with-debug \
+ && make \
+ && mv objs/nginx objs/nginx-debug \
+ && ./configure $CONFIG \
+ && make \
+ && make install \
+ && install -m755 objs/nginx-debug /usr/sbin/nginx-debug \
+ && strip /usr/sbin/nginx* \
+ && runDeps="$( \
+ scanelf --needed --nobanner /usr/sbin/nginx \
+ | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
+ | sort -u \
+ | xargs -r apk info --installed \
+ | sort -u \
+ )" \
+ && apk add --virtual .nginx-rundeps $runDeps \
+ && apk del .build-deps \
+ && rm -rf /usr/src/nginx-* \
+ \
+ # forward request and error logs to docker log collector
+ && ln -sf /dev/stdout /var/log/nginx/access.log \
+ && ln -sf /dev/stderr /var/log/nginx/error.log
+
+EXPOSE 80 443
+
+# StorPerf addition below
ARG BRANCH=master
COPY ./html /etc/nginx/html
EXPOSE 5000
+CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
# $ docker build -t opnfv/storperf-master:tag .
#
-FROM alpine:3.5 as storperf-builder
+ARG ARCH=x86_64
+ARG ALPINE_VERSION=v3.6
+FROM multiarch/alpine:$ARCH-$ALPINE_VERSION as storperf-builder
LABEL version="5.0" description="OPNFV Storperf Docker container"
# Build stripped down StorPerf image
-FROM alpine:3.5 as storperf-master
+FROM multiarch/alpine:$ARCH-$ALPINE_VERSION as storperf-master
RUN apk --no-cache add --update \
python \
##
-FROM alpine:3.1
+ARG ARCH=x86_64
+ARG ALPINE_VERSION=v3.6
+FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
MAINTAINER Mark Beierl <mark.beierl@dell.com>
LABEL version="0.1" description="OPNFV Storperf Reporting Container"
--- /dev/null
+##############################################################################
+# Copyright (c) 2017 Dell EMC and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+# Docker container for StorPerf HTTP Front ENd
+#
+# Build:
+# $ docker build -t opnfv/storperf-swaggerui:tag .
+##
+
+ARG ARCH=x86_64
+ARG ALPINE_VERSION=v3.6
+FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
+
+# This is from https://github.com/nodejs/docker-node/blob/f547c4c7281027d5d90f4665815140126e1f70d5/8.2/alpine/Dockerfile
+
+ENV NPM_CONFIG_LOGLEVEL info
+ENV NODE_VERSION 8.2.1
+
+RUN addgroup -g 1000 node \
+ && adduser -u 1000 -G node -s /bin/sh -D node \
+ && apk add --no-cache \
+ libstdc++ \
+ && apk add --no-cache --virtual .build-deps \
+ binutils-gold \
+ curl \
+ g++ \
+ gcc \
+ gnupg \
+ libgcc \
+ linux-headers \
+ make \
+ python \
+ # gpg keys listed at https://github.com/nodejs/node#release-team
+ && for key in \
+ 9554F04D7259F04124DE6B476D5A82AC7E37093B \
+ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+ FD3A5288F042B6850C66B31F09FE44734EB7990E \
+ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+ B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+ 56730D5401028683275BD23C23EFEFE93C4CFFFE \
+ ; do \
+ gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+ gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
+ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
+ done \
+ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
+ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
+ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
+ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
+ && tar -xf "node-v$NODE_VERSION.tar.xz" \
+ && cd "node-v$NODE_VERSION" \
+ && ./configure \
+ && make -j$(getconf _NPROCESSORS_ONLN) \
+ && make install \
+ && apk del .build-deps \
+ && cd .. \
+ && rm -Rf "node-v$NODE_VERSION" \
+ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
+
+ENV YARN_VERSION 0.27.5
+
+RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
+ && for key in \
+ 6A010C5166006599AA17F08146C2130DFD2497F5 \
+ ; do \
+ gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+ gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
+ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
+ done \
+ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
+ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
+ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+ && mkdir -p /opt/yarn \
+ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
+ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
+ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
+ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+&& apk del .build-deps-yarn
+
+
+
+# This is from https://github.com/schickling/dockerfiles/blob/master/swagger-ui/Dockerfile
+
+MAINTAINER Johannes Schickling "schickling.j@gmail.com"
+
+ENV VERSION "v2.2.10"
+ENV FOLDER "swagger-ui-2.2.10"
+ENV API_URL "http://petstore.swagger.io/v2/swagger.json"
+ENV API_KEY "**None**"
+ENV OAUTH_CLIENT_ID "**None**"
+ENV OAUTH_CLIENT_SECRET "**None**"
+ENV OAUTH_REALM "**None**"
+ENV OAUTH_APP_NAME "**None**"
+ENV OAUTH_ADDITIONAL_PARAMS "**None**"
+ENV SWAGGER_JSON "/app/swagger.json"
+ENV PORT 80
+
+WORKDIR /app
+
+RUN apk add --no-cache openssl
+RUN wget -qO- https://github.com/swagger-api/swagger-ui/archive/$VERSION.tar.gz | tar xvz
+RUN cp -r $FOLDER/dist/* . && rm -rf $FOLDER
+RUN npm config set unsafe-perm true
+RUN npm install -g http-server
+RUN apk del openssl
+
+ADD run.sh run.sh
+
+# webserver port
+EXPOSE 80
+
+CMD ["sh", "run.sh"]
\ No newline at end of file
--- /dev/null
+#! /bin/sh
+##############################################################################
+# Copyright (c) 2017 Dell EMC and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+#
+# From https://github.com/schickling/dockerfiles/blob/master/swagger-ui/run.sh
+#
+set -e
+
+replace_in_index () {
+ if [ "$1" != "**None**" ]; then
+ sed -i "s|/\*||g" index.html
+ sed -i "s|\*/||g" index.html
+ sed -i "s|$1|$2|g" index.html
+ fi
+}
+
+replace_or_delete_in_index () {
+ if [ -z "$2" ]; then
+ sed -i "/$1/d" index.html
+ else
+ replace_in_index $1 $2
+ fi
+}
+
+replace_in_index myApiKeyXXXX123456789 $API_KEY
+replace_or_delete_in_index your-client-id $OAUTH_CLIENT_ID
+replace_or_delete_in_index your-client-secret-if-required $OAUTH_CLIENT_SECRET
+replace_or_delete_in_index your-realms $OAUTH_REALM
+replace_or_delete_in_index your-app-name $OAUTH_APP_NAME
+if [ "$OAUTH_ADDITIONAL_PARAMS" != "**None**" ]; then
+ replace_in_index "additionalQueryStringParams: {}" "additionalQueryStringParams: {$OAUTH_ADDITIONAL_PARAMS}"
+fi
+
+if [[ -f $SWAGGER_JSON ]]; then
+ sed -i "s|http://petstore.swagger.io/v2/swagger.json|swagger.json|g" index.html
+ sed -i "s|http://example.com/api|swagger.json|g" index.html
+else
+ sed -i "s|http://petstore.swagger.io/v2/swagger.json|$API_URL|g" index.html
+ sed -i "s|http://example.com/api|$API_URL|g" index.html
+fi
+
+if [[ -n "$VALIDATOR_URL" ]]; then
+ sed -i "s|.*validatorUrl:.*$||g" index.html
+ sed -i "s|\(url: url,.*\)|\1\n validatorUrl: \"${VALIDATOR_URL}\",|g" index.html
+fi
+
+exec http-server -p $PORT $*
\ No newline at end of file
Code Review / storperf.git / commitdiff