summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/storperf-httpfrontend/Dockerfile97
-rw-r--r--docker/storperf-master/storperf/storperf_master.py7
-rw-r--r--docker/storperf-swaggerui/Dockerfile74
3 files changed, 8 insertions, 170 deletions
diff --git a/docker/storperf-httpfrontend/Dockerfile b/docker/storperf-httpfrontend/Dockerfile
index e9cb8db..95188b5 100644
--- a/docker/storperf-httpfrontend/Dockerfile
+++ b/docker/storperf-httpfrontend/Dockerfile
@@ -14,102 +14,7 @@
ARG ARCH=x86_64
ARG ALPINE_VERSION=v3.6
-FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
-
-RUN ulimit -n 1024
-
-# 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
-
-RUN gpg --keyserver keyserver.ubuntu.com --recv-keys "$GPG_KEYS" || \
- gpg --keyserver pgp.mit.edu --recv-keys "$GPG_KEYS" || \
- gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEYS" || \
- gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$GPG_KEYS"
-
-RUN 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
+FROM nginx:alpine
EXPOSE 80 443
diff --git a/docker/storperf-master/storperf/storperf_master.py b/docker/storperf-master/storperf/storperf_master.py
index 1025789..4cd7071 100644
--- a/docker/storperf-master/storperf/storperf_master.py
+++ b/docker/storperf-master/storperf/storperf_master.py
@@ -373,7 +373,12 @@ class StorPerfMaster(object):
stack_id = None
if (self.stack_id is not None):
stack_id = self.stack_id
- self.heat_stack.clean()
+ try:
+ self.heat_stack.clean()
+ except Exception as e:
+ self.logger.error("Stack creation failed")
+ raise Exception(e)
+ self.stack_id = None
return stack_id
def executor_event(self, executor):
diff --git a/docker/storperf-swaggerui/Dockerfile b/docker/storperf-swaggerui/Dockerfile
index 4e3a83f..5d58a30 100644
--- a/docker/storperf-swaggerui/Dockerfile
+++ b/docker/storperf-swaggerui/Dockerfile
@@ -14,82 +14,10 @@
ARG ARCH=x86_64
ARG ALPINE_VERSION=v3.6
-FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
+FROM node:10-alpine
RUN ulimit -n 1024
-# 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 keyserver.ubuntu.com --recv-keys "$key" || \
- 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 keyserver.ubuntu.com --recv-keys "$key" || \
- 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"