Skip to content

Commit d24c388

Browse files
simonswinepracucci
andauthored
Update golang to 1.14.9 in build-image (#3179)
* Update golang to 1.14.9 in build-image Signed-off-by: Christian Simon <[email protected]> * Updated build-image Signed-off-by: Marco Pracucci <[email protected]> Co-authored-by: Marco Pracucci <[email protected]>
1 parent 3ef425d commit d24c388

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ defaults: &defaults
55
docker:
66
# IMPORTANT: whenever you change the build-image version tag, remember to replace it
77
# across the entire file (there are multiple references).
8-
- image: quay.io/cortexproject/build-image:clarify-local-website-setup-and-upgrade-depds-7c069848b-WIP
8+
- image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2
99
working_directory: /go/src/github.com/cortexproject/cortex
1010

1111
filters: &filters
@@ -87,7 +87,7 @@ jobs:
8787

8888
test:
8989
docker:
90-
- image: quay.io/cortexproject/build-image:clarify-local-website-setup-and-upgrade-depds-7c069848b-WIP
90+
- image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2
9191
- image: cassandra:3.11
9292
environment:
9393
JVM_OPTS: "-Xms1024M -Xmx1024M"
@@ -111,7 +111,7 @@ jobs:
111111
name: Integration Test
112112
command: |
113113
touch build-image/.uptodate
114-
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=quay.io/cortexproject/build-image:clarify-local-website-setup-and-upgrade-depds-7c069848b-WIP configs-integration-test
114+
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2 configs-integration-test
115115
116116
integration:
117117
machine:
@@ -125,8 +125,8 @@ jobs:
125125
name: Upgrade golang
126126
command: |
127127
cd /tmp && \
128-
wget https://dl.google.com/go/go1.14.4.linux-amd64.tar.gz && \
129-
tar -zxvf go1.14.4.linux-amd64.tar.gz && \
128+
wget https://dl.google.com/go/go1.14.9.linux-amd64.tar.gz && \
129+
tar -zxvf go1.14.9.linux-amd64.tar.gz && \
130130
sudo rm -fr /usr/local/go && \
131131
sudo mv /tmp/go /usr/local/go && \
132132
cd -

build-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14.4-stretch
1+
FROM golang:1.14.9-stretch
22
ARG goproxyValue
33
ENV GOPROXY=${goproxyValue}
44
RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \

0 commit comments

Comments
 (0)