Go updated to 1.12.9

[ta/caas-metrics.git] / docker-build / prometheus / Dockerfile

diff --git a/docker-build/prometheus/Dockerfile b/docker-build/prometheus/Dockerfile
index cf831ab..22f0bb6 100644 (file)
--- a/docker-build/prometheus/Dockerfile
+++ b/docker-build/prometheus/Dockerfile
@@ -15,24 +15,16 @@
 FROM alpine:3.9
 MAINTAINER Szekeres Balazs <balazs.szekeres@nokia.com>
 
-ARG GO_REQUIRED
-ENV GO_REQUIRED_VERSION=$GO_REQUIRED
-ARG PROMETHEUS
-ENV PROMETHEUS_VERSION=$PROMETHEUS
-
 ARG go_install_dir="/usr/local/go"
-
+ARG go_version
+ARG PROMETHEUS_VERSION
 ENV PATH="$go_install_dir/bin:$PATH"
-ENV GOROOT_BOOTSTRAP="$go_install_dir"
-ENV USER=root
 
 RUN apk add --no-cache --virtual .build-deps build-base go godep curl tar git bash \
 &&  mkdir -p $go_install_dir \
-\
-&&  curl -fsSL -k https://dl.google.com/go/go${GO_REQUIRED_VERSION}.src.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
+&&  curl -fsSL -k https://dl.google.com/go/go${go_version}.src.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
 &&  cd ${go_install_dir}/src/ \
 &&  ./make.bash \
-\
 &&  mkdir -p ${GOPATH}/src/github.com/prometheus/prometheus \
 &&  curl -fsSL -k https://github.com/prometheus/prometheus/archive/v${PROMETHEUS_VERSION}.tar.gz | tar zx --strip-components=1 -C ${GOPATH}/src/github.com/prometheus/prometheus \
 &&  cd ${GOPATH}/src/github.com/prometheus/prometheus \
@@ -42,6 +34,7 @@ RUN apk add --no-cache --virtual .build-deps build-base go godep curl tar git ba
 &&  apk del .build-deps \
 &&  rm -rf /build \
 &&  rm -rf ${GOPATH} \
+&&  rm -rf $go_install_dir \
 &&  apk add --no-cache nginx nginx-mod-stream supervisor \
 &&  mkdir /var/run/supervisor/ \
 &&  touch /run/nginx.pid /var/run/supervisor/supervisord.pid