From 0a080beffaf3b54b7e71b7d292bea3ad10380ac9 Mon Sep 17 00:00:00 2001 From: Lukas Siatka Date: Thu, 21 Nov 2019 15:16:32 +0100 Subject: [PATCH] DevEnv: updates nodejs from 10.x to 12.x and golang to 1.13 in ci-deploy dockerfile. (#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 --- .circleci/config.yml | 48 +++++++++---------- Dockerfile | 4 +- Dockerfile.ubuntu | 4 +- .../blocks/prometheus_random_data/Dockerfile | 2 +- package.json | 2 +- scripts/build/ci-build/Dockerfile | 2 +- scripts/build/ci-build/build-deploy.sh | 2 +- scripts/build/ci-deploy/Dockerfile | 2 +- scripts/build/ci-deploy/build-deploy.sh | 2 +- scripts/build/old_appveyor.yml | 4 +- scripts/build/update_repo/README.md | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 868bd3c002f..ce16986b5be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,7 +19,7 @@ version: 2 jobs: mysql-integration-test: docker: - - image: circleci/golang:1.13.1 + - image: circleci/golang:1.13.4 - image: circleci/mysql:5.6-ram environment: MYSQL_ROOT_PASSWORD: rootpass @@ -50,7 +50,7 @@ jobs: postgres-integration-test: docker: - - image: circleci/golang:1.13.1 + - image: circleci/golang:1.13.4 - image: circleci/postgres:9.3-ram environment: POSTGRES_USER: grafanatest @@ -80,7 +80,7 @@ jobs: cache-server-test: docker: - - image: circleci/golang:1.13.1 + - image: circleci/golang:1.13.4 - image: circleci/redis:4-alpine - image: memcached working_directory: /go/src/github.com/grafana/grafana @@ -105,7 +105,7 @@ jobs: end-to-end-test: docker: - - image: circleci/node:10-browsers + - image: circleci/node:12-browsers - image: grafana/grafana-dev:master-$CIRCLE_SHA1 steps: - run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s @@ -144,7 +144,7 @@ jobs: end-to-end-test-release: docker: - - image: circleci/node:10-browsers + - image: circleci/node:12-browsers - image: grafana/grafana-dev:$CIRCLE_TAG steps: - run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s @@ -199,7 +199,7 @@ jobs: lint-go: docker: - - image: circleci/golang:1.13.1 + - image: circleci/golang:1.13.4 environment: # we need CGO because of go-sqlite3 CGO_ENABLED: 1 @@ -221,7 +221,7 @@ jobs: test-frontend: docker: - - image: circleci/node:10 + - image: circleci/node:12 steps: - checkout - run: @@ -251,7 +251,7 @@ jobs: test-backend: docker: - - image: circleci/golang:1.13.1 + - image: circleci/golang:1.13.4 working_directory: /go/src/github.com/grafana/grafana steps: - checkout @@ -273,7 +273,7 @@ jobs: build-all: docker: - - image: grafana/build-container:1.2.12 + - image: grafana/build-container:1.2.13 working_directory: /go/src/github.com/grafana/grafana steps: - checkout @@ -328,7 +328,7 @@ jobs: build: docker: - - image: grafana/build-container:1.2.12 + - image: grafana/build-container:1.2.13 working_directory: /go/src/github.com/grafana/grafana steps: - checkout @@ -368,7 +368,7 @@ jobs: build-fast-backend: docker: - - image: grafana/build-container:1.2.12 + - image: grafana/build-container:1.2.13 working_directory: /go/src/github.com/grafana/grafana steps: - checkout @@ -396,7 +396,7 @@ jobs: build-fast-frontend: docker: - - image: grafana/build-container:1.2.12 + - image: grafana/build-container:1.2.13 working_directory: /go/src/github.com/grafana/grafana steps: - checkout @@ -431,7 +431,7 @@ jobs: build-fast-package: docker: - - image: grafana/build-container:1.2.12 + - image: grafana/build-container:1.2.13 working_directory: /go/src/github.com/grafana/grafana steps: - checkout @@ -469,7 +469,7 @@ jobs: build-fast-save: docker: - - image: grafana/build-container:1.2.12 + - image: grafana/build-container:1.2.13 working_directory: /go/src/github.com/grafana/grafana steps: - checkout @@ -676,7 +676,7 @@ jobs: build-enterprise: docker: - - image: grafana/build-container:1.2.12 + - image: grafana/build-container:1.2.13 working_directory: /go/src/github.com/grafana/grafana steps: - checkout @@ -722,7 +722,7 @@ jobs: build-all-enterprise: docker: - - image: grafana/build-container:1.2.12 + - image: grafana/build-container:1.2.13 working_directory: /go/src/github.com/grafana/grafana steps: - checkout @@ -780,7 +780,7 @@ jobs: deploy-enterprise-master: docker: - - image: grafana/grafana-ci-deploy:1.2.2 + - image: grafana/grafana-ci-deploy:1.2.3 steps: - attach_workspace: at: . @@ -802,7 +802,7 @@ jobs: deploy-enterprise-release: docker: - - image: grafana/grafana-ci-deploy:1.2.2 + - image: grafana/grafana-ci-deploy:1.2.3 steps: - checkout - run: @@ -852,7 +852,7 @@ jobs: deploy-master: docker: - - image: grafana/grafana-ci-deploy:1.2.2 + - image: grafana/grafana-ci-deploy:1.2.3 steps: - attach_workspace: at: . @@ -876,7 +876,7 @@ jobs: deploy-release: docker: - - image: grafana/grafana-ci-deploy:1.2.2 + - image: grafana/grafana-ci-deploy:1.2.3 steps: - checkout - run: @@ -952,7 +952,7 @@ jobs: store-build-artifacts: docker: - - image: circleci/node:10 + - image: circleci/node:12 steps: - attach_workspace: at: . @@ -990,7 +990,7 @@ jobs: build-grafana-packages: docker: - - image: circleci/node:10 + - image: circleci/node:12 steps: - checkout - run: @@ -1014,7 +1014,7 @@ jobs: release-next-packages: docker: - - image: circleci/node:10 + - image: circleci/node:12 steps: - checkout - run: @@ -1040,7 +1040,7 @@ jobs: release-packages: docker: - - image: circleci/node:10 + - image: circleci/node:12 steps: - checkout - run: diff --git a/Dockerfile b/Dockerfile index 9e2de422928..51387f7cf75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Golang build container -FROM golang:1.13.1-alpine +FROM golang:1.13.4-alpine RUN apk add --no-cache gcc g++ @@ -16,7 +16,7 @@ COPY build.go package.json ./ RUN go run build.go build # Node build container -FROM node:10.14.2-alpine +FROM node:12.13.0-alpine # PhantomJS RUN apk add --no-cache curl &&\ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index e704bd249ee..56950b58eec 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM golang:1.13.1 AS go-builder +FROM golang:1.13.4 AS go-builder WORKDIR /src/grafana @@ -12,7 +12,7 @@ COPY pkg pkg/ RUN go run build.go build -FROM node:10.17 AS js-builder +FROM node:12.13 AS js-builder # PhantomJS RUN apt-get update && apt-get install -y curl &&\ diff --git a/devenv/docker/blocks/prometheus_random_data/Dockerfile b/devenv/docker/blocks/prometheus_random_data/Dockerfile index f22fa80fc3e..51f14e565cd 100644 --- a/devenv/docker/blocks/prometheus_random_data/Dockerfile +++ b/devenv/docker/blocks/prometheus_random_data/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile builds an image for a client_golang example. # Builder image, where we build the example. -FROM golang:1.13.0 AS builder +FROM golang:1.13.4 AS builder # Download prometheus/client_golang/examples/random first RUN go get github.com/prometheus/client_golang/examples/random WORKDIR /go/src/github.com/prometheus/client_golang diff --git a/package.json b/package.json index b916709164b..ecac375bec3 100644 --- a/package.json +++ b/package.json @@ -275,6 +275,6 @@ "puppeteer": "node_modules/puppeteer-core" }, "engines": { - "node": ">=10 <11" + "node": ">=12 <13" } } diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index 8e5824794ce..89086431833 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -76,7 +76,7 @@ FROM ubuntu:18.04 ENV GOVERSION=1.13.4 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ - NODEVERSION=10.17.0 + NODEVERSION=12.13.0 ARG DEBIAN_FRONTEND=noninteractive diff --git a/scripts/build/ci-build/build-deploy.sh b/scripts/build/ci-build/build-deploy.sh index 5765968b691..7b3cefacba0 100755 --- a/scripts/build/ci-build/build-deploy.sh +++ b/scripts/build/ci-build/build-deploy.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eo pipefail -_version="1.2.12" +_version="1.2.13" _tag="grafana/build-container:${_version}" _dpath=$(dirname "${BASH_SOURCE[0]}") diff --git a/scripts/build/ci-deploy/Dockerfile b/scripts/build/ci-deploy/Dockerfile index 39a85c2bb0f..ce05ccbc160 100644 --- a/scripts/build/ci-deploy/Dockerfile +++ b/scripts/build/ci-deploy/Dockerfile @@ -1,4 +1,4 @@ -FROM circleci/golang:1.11 +FROM circleci/golang:1.13 RUN git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-dev/aptly && \ cd $GOPATH/src/github.com/aptly-dev/aptly && \ diff --git a/scripts/build/ci-deploy/build-deploy.sh b/scripts/build/ci-deploy/build-deploy.sh index 6d1b8e57b7b..223036e0bca 100755 --- a/scripts/build/ci-deploy/build-deploy.sh +++ b/scripts/build/ci-deploy/build-deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash -_version="1.2.2" +_version="1.2.3" _tag="grafana/grafana-ci-deploy:${_version}" docker build -t $_tag . diff --git a/scripts/build/old_appveyor.yml b/scripts/build/old_appveyor.yml index ccf9b5a06e1..be990970b0d 100644 --- a/scripts/build/old_appveyor.yml +++ b/scripts/build/old_appveyor.yml @@ -5,9 +5,9 @@ os: Windows Server 2012 R2 clone_folder: c:\gopath\src\github.com\grafana\grafana environment: - nodejs_version: "8" + nodejs_version: "12" GOPATH: C:\gopath - GOVERSION: 1.11.5 + GOVERSION: 1.13.4 install: - rmdir c:\go /s /q diff --git a/scripts/build/update_repo/README.md b/scripts/build/update_repo/README.md index 8936454db37..b63d00b00da 100644 --- a/scripts/build/update_repo/README.md +++ b/scripts/build/update_repo/README.md @@ -7,7 +7,7 @@ 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. ```bash -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 +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 # in the container: mkdir -p /dist