Skip to content

N
nexpie-grafana-theme
Commit 0a080bef by Lukas Siatka Committed by GitHub
Options

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
parent 4ddb113b
Showing with 37 additions and 37 deletions
.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:
......
Dockerfile
# 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 &&\
......
Dockerfile.ubuntu
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 &&\
......
devenv/docker/blocks/prometheus_random_data/Dockerfile
# 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
......
package.json
......@@ -275,6 +275,6 @@
"puppeteer": "node_modules/puppeteer-core"
},
"engines": {
"node": ">=10 <11"
"node": ">=12 <13"
}
}
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
......
scripts/build/ci-build/build-deploy.sh
#!/bin/bash
set -eo pipefail
_version="1.2.12"
_version="1.2.13"
_tag="grafana/build-container:${_version}"
_dpath=$(dirname "${BASH_SOURCE[0]}")
......
scripts/build/ci-deploy/Dockerfile
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 && \
......
scripts/build/ci-deploy/build-deploy.sh
#!/bin/bash
_version="1.2.2"
_version="1.2.3"
_tag="grafana/grafana-ci-deploy:${_version}"
docker build -t $_tag .
......
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
......
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment