diff --git a/CHANGELOG.md b/CHANGELOG.md index 9948c5ebc8a..cf0700c4daf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ * [FEATURE] TLS config options added for GRPC clients in Querier (Query-frontend client & Ingester client), Ruler, Store Gateway, as well as HTTP client in Config store client. #2502 * [FEATURE] The flag `-frontend.max-cache-freshness` is now supported within the limits overrides, to specify per-tenant max cache freshness values. The corresponding YAML config parameter has been changed from `results_cache.max_freshness` to `limits_config.max_cache_freshness`. The legacy YAML config parameter (`results_cache.max_freshness`) will continue to be supported till Cortex release `v1.4.0`. #2609 * [FEATURE] Experimental gRPC Store: Added support to 3rd parties index and chunk stores using gRPC client/server plugin mechanism. #2220 +* [ENHANCEMENT] Propagate GOPROXY value when building `build-image`. This is to help the builders building the code in a Network where default Go proxy is not accessible (e.g. when behind some corporate VPN). #2741 * [ENHANCEMENT] Querier: Added metric `cortex_querier_request_duration_seconds` for all requests to the querier. #2708 * [ENHANCEMENT] Experimental TSDB: added the following metrics to the ingester: #2580 #2583 #2589 #2654 * `cortex_ingester_tsdb_appender_add_duration_seconds` diff --git a/Makefile b/Makefile index cbab03a7caa..a396f3348a9 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ # Version number VERSION=$(shell cat "./VERSION" 2> /dev/null) +GOPROXY_VALUE=$(shell go env GOPROXY) # Boiler plate for building Docker containers. # All this must go at top of file I'm afraid. @@ -23,7 +24,7 @@ SED ?= $(shell which gsed 2>/dev/null || which sed) # declared. %/$(UPTODATE): %/Dockerfile @echo - $(SUDO) docker build --build-arg=revision=$(GIT_REVISION) -t $(IMAGE_PREFIX)$(shell basename $(@D)) $(@D)/ + $(SUDO) docker build --build-arg=revision=$(GIT_REVISION) --build-arg=goproxyValue=$(GOPROXY_VALUE) -t $(IMAGE_PREFIX)$(shell basename $(@D)) $(@D)/ $(SUDO) docker tag $(IMAGE_PREFIX)$(shell basename $(@D)) $(IMAGE_PREFIX)$(shell basename $(@D)):$(IMAGE_TAG) touch $@ diff --git a/build-image/Dockerfile b/build-image/Dockerfile index fc62a6c2477..46924b067f8 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -1,4 +1,6 @@ FROM golang:1.14.4-stretch +ARG goproxyValue +ENV GOPROXY=${goproxyValue} RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -