Speed up Builds

Adding a new keyserver and ulimit to help speed up
builds.

Change-Id: If79ba1e533bfe2044606d98047abe9fa342aefb4
Signed-off-by: mbeierl <mark.beierl@dell.com>
(cherry picked from commit e71013c4cb73c8ccbd01782cbd814030f4008b9b)

diff --git a/docker/storperf-graphite/Dockerfile b/docker/storperf-graphite/Dockerfile
index b566458..c2ffa81 100644 (file)
--- a/docker/storperf-graphite/Dockerfile
+++ b/docker/storperf-graphite/Dockerfile
@@ -18,6 +18,8 @@ ARG ARCH=x86_64
 ARG ALPINE_VERSION=v3.5
 FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
 
+RUN ulimit -n 1024
+
 # Install basic stuff =)
 RUN apk add --no-cache \
   bash \

diff --git a/docker/storperf-httpfrontend/Dockerfile b/docker/storperf-httpfrontend/Dockerfile
index 9b5b5f9..c803d19 100644 (file)
--- a/docker/storperf-httpfrontend/Dockerfile
+++ b/docker/storperf-httpfrontend/Dockerfile
@@ -16,6 +16,8 @@ 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
 
@@ -73,7 +75,8 @@ RUN \
         curl \
         gnupg
 
-RUN gpg --keyserver pgp.mit.edu --recv-keys "$GPG_KEYS" || \
+RUN gpg --keyserver keyserver.ubuntu.com --recv-keys "$key" || \
+       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"
 

diff --git a/docker/storperf-master/Dockerfile b/docker/storperf-master/Dockerfile
index eaaf811..fec3931 100644 (file)
--- a/docker/storperf-master/Dockerfile
+++ b/docker/storperf-master/Dockerfile
@@ -19,6 +19,8 @@ ARG ARCH=x86_64
 ARG ALPINE_VERSION=v3.6
 FROM multiarch/alpine:$ARCH-$ALPINE_VERSION as storperf-builder
 
+RUN ulimit -n 1024
+
 LABEL version="5.0" description="OPNFV Storperf Docker container"
 
 ARG BRANCH=master

diff --git a/docker/storperf-reporting/Dockerfile b/docker/storperf-reporting/Dockerfile
index ac507a6..ff28dd1 100644 (file)
--- a/docker/storperf-reporting/Dockerfile
+++ b/docker/storperf-reporting/Dockerfile
@@ -23,6 +23,8 @@ LABEL version="0.1" description="OPNFV Storperf Reporting Container"
 
 ARG BRANCH=master
 
+RUN ulimit -n 1024
+
 RUN apk add --update python py-pip
 
 COPY . /home/opnfv/storperf-reporting

diff --git a/docker/storperf-swaggerui/Dockerfile b/docker/storperf-swaggerui/Dockerfile
index 14c9fe1..4e3a83f 100644 (file)
--- a/docker/storperf-swaggerui/Dockerfile
+++ b/docker/storperf-swaggerui/Dockerfile
@@ -16,6 +16,8 @@ ARG ARCH=x86_64
 ARG ALPINE_VERSION=v3.6
 FROM multiarch/alpine:$ARCH-$ALPINE_VERSION
 
+RUN ulimit -n 1024
+
 # This is from https://github.com/nodejs/docker-node/blob/f547c4c7281027d5d90f4665815140126e1f70d5/8.2/alpine/Dockerfile
 
 ENV NPM_CONFIG_LOGLEVEL info
@@ -46,6 +48,7 @@ RUN addgroup -g 1000 node \
     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" ; \
@@ -70,6 +73,7 @@ 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" ; \
@@ -104,8 +108,8 @@ 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 apk add --no-cache openssl curl
+RUN curl -SL 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