Skip to content

Commit 0a080be

Browse files
author
Lukas Siatka
authored
DevEnv: updates nodejs from 10.x to 12.x and golang to 1.13 in ci-deploy dockerfile. (grafana#20405)
* DevEnv: updates nodejs to 12.x and golang to 1.13 * Updates CI-build and CI-deploy image versions * DevEnv: updates update repo readme * DevEnv: updates build container version
1 parent 4ddb113 commit 0a080be

File tree

11 files changed

+37
-37
lines changed

11 files changed

+37
-37
lines changed

.circleci/config.yml

+24-24
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ version: 2
1919
jobs:
2020
mysql-integration-test:
2121
docker:
22-
- image: circleci/golang:1.13.1
22+
- image: circleci/golang:1.13.4
2323
- image: circleci/mysql:5.6-ram
2424
environment:
2525
MYSQL_ROOT_PASSWORD: rootpass
@@ -50,7 +50,7 @@ jobs:
5050

5151
postgres-integration-test:
5252
docker:
53-
- image: circleci/golang:1.13.1
53+
- image: circleci/golang:1.13.4
5454
- image: circleci/postgres:9.3-ram
5555
environment:
5656
POSTGRES_USER: grafanatest
@@ -80,7 +80,7 @@ jobs:
8080

8181
cache-server-test:
8282
docker:
83-
- image: circleci/golang:1.13.1
83+
- image: circleci/golang:1.13.4
8484
- image: circleci/redis:4-alpine
8585
- image: memcached
8686
working_directory: /go/src/github.com/grafana/grafana
@@ -105,7 +105,7 @@ jobs:
105105

106106
end-to-end-test:
107107
docker:
108-
- image: circleci/node:10-browsers
108+
- image: circleci/node:12-browsers
109109
- image: grafana/grafana-dev:master-$CIRCLE_SHA1
110110
steps:
111111
- run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s
@@ -144,7 +144,7 @@ jobs:
144144

145145
end-to-end-test-release:
146146
docker:
147-
- image: circleci/node:10-browsers
147+
- image: circleci/node:12-browsers
148148
- image: grafana/grafana-dev:$CIRCLE_TAG
149149
steps:
150150
- run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s
@@ -199,7 +199,7 @@ jobs:
199199

200200
lint-go:
201201
docker:
202-
- image: circleci/golang:1.13.1
202+
- image: circleci/golang:1.13.4
203203
environment:
204204
# we need CGO because of go-sqlite3
205205
CGO_ENABLED: 1
@@ -221,7 +221,7 @@ jobs:
221221

222222
test-frontend:
223223
docker:
224-
- image: circleci/node:10
224+
- image: circleci/node:12
225225
steps:
226226
- checkout
227227
- run:
@@ -251,7 +251,7 @@ jobs:
251251

252252
test-backend:
253253
docker:
254-
- image: circleci/golang:1.13.1
254+
- image: circleci/golang:1.13.4
255255
working_directory: /go/src/github.com/grafana/grafana
256256
steps:
257257
- checkout
@@ -273,7 +273,7 @@ jobs:
273273

274274
build-all:
275275
docker:
276-
- image: grafana/build-container:1.2.12
276+
- image: grafana/build-container:1.2.13
277277
working_directory: /go/src/github.com/grafana/grafana
278278
steps:
279279
- checkout
@@ -328,7 +328,7 @@ jobs:
328328

329329
build:
330330
docker:
331-
- image: grafana/build-container:1.2.12
331+
- image: grafana/build-container:1.2.13
332332
working_directory: /go/src/github.com/grafana/grafana
333333
steps:
334334
- checkout
@@ -368,7 +368,7 @@ jobs:
368368

369369
build-fast-backend:
370370
docker:
371-
- image: grafana/build-container:1.2.12
371+
- image: grafana/build-container:1.2.13
372372
working_directory: /go/src/github.com/grafana/grafana
373373
steps:
374374
- checkout
@@ -396,7 +396,7 @@ jobs:
396396

397397
build-fast-frontend:
398398
docker:
399-
- image: grafana/build-container:1.2.12
399+
- image: grafana/build-container:1.2.13
400400
working_directory: /go/src/github.com/grafana/grafana
401401
steps:
402402
- checkout
@@ -431,7 +431,7 @@ jobs:
431431

432432
build-fast-package:
433433
docker:
434-
- image: grafana/build-container:1.2.12
434+
- image: grafana/build-container:1.2.13
435435
working_directory: /go/src/github.com/grafana/grafana
436436
steps:
437437
- checkout
@@ -469,7 +469,7 @@ jobs:
469469

470470
build-fast-save:
471471
docker:
472-
- image: grafana/build-container:1.2.12
472+
- image: grafana/build-container:1.2.13
473473
working_directory: /go/src/github.com/grafana/grafana
474474
steps:
475475
- checkout
@@ -676,7 +676,7 @@ jobs:
676676

677677
build-enterprise:
678678
docker:
679-
- image: grafana/build-container:1.2.12
679+
- image: grafana/build-container:1.2.13
680680
working_directory: /go/src/github.com/grafana/grafana
681681
steps:
682682
- checkout
@@ -722,7 +722,7 @@ jobs:
722722

723723
build-all-enterprise:
724724
docker:
725-
- image: grafana/build-container:1.2.12
725+
- image: grafana/build-container:1.2.13
726726
working_directory: /go/src/github.com/grafana/grafana
727727
steps:
728728
- checkout
@@ -780,7 +780,7 @@ jobs:
780780

781781
deploy-enterprise-master:
782782
docker:
783-
- image: grafana/grafana-ci-deploy:1.2.2
783+
- image: grafana/grafana-ci-deploy:1.2.3
784784
steps:
785785
- attach_workspace:
786786
at: .
@@ -802,7 +802,7 @@ jobs:
802802
803803
deploy-enterprise-release:
804804
docker:
805-
- image: grafana/grafana-ci-deploy:1.2.2
805+
- image: grafana/grafana-ci-deploy:1.2.3
806806
steps:
807807
- checkout
808808
- run:
@@ -852,7 +852,7 @@ jobs:
852852

853853
deploy-master:
854854
docker:
855-
- image: grafana/grafana-ci-deploy:1.2.2
855+
- image: grafana/grafana-ci-deploy:1.2.3
856856
steps:
857857
- attach_workspace:
858858
at: .
@@ -876,7 +876,7 @@ jobs:
876876
877877
deploy-release:
878878
docker:
879-
- image: grafana/grafana-ci-deploy:1.2.2
879+
- image: grafana/grafana-ci-deploy:1.2.3
880880
steps:
881881
- checkout
882882
- run:
@@ -952,7 +952,7 @@ jobs:
952952

953953
store-build-artifacts:
954954
docker:
955-
- image: circleci/node:10
955+
- image: circleci/node:12
956956
steps:
957957
- attach_workspace:
958958
at: .
@@ -990,7 +990,7 @@ jobs:
990990

991991
build-grafana-packages:
992992
docker:
993-
- image: circleci/node:10
993+
- image: circleci/node:12
994994
steps:
995995
- checkout
996996
- run:
@@ -1014,7 +1014,7 @@ jobs:
10141014

10151015
release-next-packages:
10161016
docker:
1017-
- image: circleci/node:10
1017+
- image: circleci/node:12
10181018
steps:
10191019
- checkout
10201020
- run:
@@ -1040,7 +1040,7 @@ jobs:
10401040

10411041
release-packages:
10421042
docker:
1043-
- image: circleci/node:10
1043+
- image: circleci/node:12
10441044
steps:
10451045
- checkout
10461046
- run:

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Golang build container
2-
FROM golang:1.13.1-alpine
2+
FROM golang:1.13.4-alpine
33

44
RUN apk add --no-cache gcc g++
55

@@ -16,7 +16,7 @@ COPY build.go package.json ./
1616
RUN go run build.go build
1717

1818
# Node build container
19-
FROM node:10.14.2-alpine
19+
FROM node:12.13.0-alpine
2020

2121
# PhantomJS
2222
RUN apk add --no-cache curl &&\

Dockerfile.ubuntu

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13.1 AS go-builder
1+
FROM golang:1.13.4 AS go-builder
22

33
WORKDIR /src/grafana
44

@@ -12,7 +12,7 @@ COPY pkg pkg/
1212

1313
RUN go run build.go build
1414

15-
FROM node:10.17 AS js-builder
15+
FROM node:12.13 AS js-builder
1616

1717
# PhantomJS
1818
RUN apt-get update && apt-get install -y curl &&\

devenv/docker/blocks/prometheus_random_data/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Dockerfile builds an image for a client_golang example.
22

33
# Builder image, where we build the example.
4-
FROM golang:1.13.0 AS builder
4+
FROM golang:1.13.4 AS builder
55
# Download prometheus/client_golang/examples/random first
66
RUN go get github.com/prometheus/client_golang/examples/random
77
WORKDIR /go/src/github.com/prometheus/client_golang

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,6 @@
275275
"puppeteer": "node_modules/puppeteer-core"
276276
},
277277
"engines": {
278-
"node": ">=10 <11"
278+
"node": ">=12 <13"
279279
}
280280
}

scripts/build/ci-build/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ FROM ubuntu:18.04
7676
ENV GOVERSION=1.13.4 \
7777
PATH=/usr/local/go/bin:$PATH \
7878
GOPATH=/go \
79-
NODEVERSION=10.17.0
79+
NODEVERSION=12.13.0
8080

8181
ARG DEBIAN_FRONTEND=noninteractive
8282

scripts/build/ci-build/build-deploy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -eo pipefail
33

4-
_version="1.2.12"
4+
_version="1.2.13"
55
_tag="grafana/build-container:${_version}"
66

77
_dpath=$(dirname "${BASH_SOURCE[0]}")

scripts/build/ci-deploy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM circleci/golang:1.11
1+
FROM circleci/golang:1.13
22

33
RUN git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-dev/aptly && \
44
cd $GOPATH/src/github.com/aptly-dev/aptly && \

scripts/build/ci-deploy/build-deploy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
_version="1.2.2"
3+
_version="1.2.3"
44
_tag="grafana/grafana-ci-deploy:${_version}"
55

66
docker build -t $_tag .

scripts/build/old_appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ os: Windows Server 2012 R2
55
clone_folder: c:\gopath\src\github.com\grafana\grafana
66

77
environment:
8-
nodejs_version: "8"
8+
nodejs_version: "12"
99
GOPATH: C:\gopath
10-
GOVERSION: 1.11.5
10+
GOVERSION: 1.13.4
1111

1212
install:
1313
- rmdir c:\go /s /q

scripts/build/update_repo/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
It's possible to test the repo updates for rpm and deb by running the test scripts within a docker container like this. Tests are being executed by using two buckets on gcp setup for testing.
88

99
```bash
10-
docker run -ti --rm -u 0:0 grafana/grafana-ci-deploy:1.2.2 bash # 1.2.2 is the newest image at the time of writing
10+
docker run -ti --rm -u 0:0 grafana/grafana-ci-deploy:1.2.3 bash # 1.2.3 is the newest image at the time of writing
1111
# in the container:
1212
mkdir -p /dist
1313

0 commit comments

Comments
 (0)