summaryrefslogtreecommitdiffstats
path: root/docker/storperf-httpfrontend/Dockerfile
diff options
context:
space:
mode:
authormbeierl <mark.beierl@dell.com>2018-07-09 15:09:07 -0400
committermbeierl <mark.beierl@dell.com>2018-07-09 15:40:13 -0400
commit4ac628e18e5f9d03e13b10f9b26f57374bdc0658 (patch)
treeb80ce482dd1510ee044fdc9775c56617e53efed7 /docker/storperf-httpfrontend/Dockerfile
parent3de258b9d0f6d4249a5e7f42eec41fcb0080bc66 (diff)
Switch to upstream nginx
Uses the official upstream nginx container image instead of building a custom one to support ARM (aarch64). Uses the official upstream node image instead of building a customer one for ARM. Change-Id: Ib465333204d3f1718da8cfb314cad32d955a3d2b JITA: STORPERF-250 Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'docker/storperf-httpfrontend/Dockerfile')
-rw-r--r--docker/storperf-httpfrontend/Dockerfile97
1 files changed, 1 insertions, 96 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