opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 05:53:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

NodeJS: Update to LTS (14) (#29467)

Browse Source 
* NodeJS: Update to LTS (14)

* Bump Volta's Node version

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Bump version of build image

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Upgrade build image

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Torkel Ödegaard
2020-12-02 18:18:49 +01:00
committed by GitHub
parent 18c3f7bba0
commit 00d59ec1fc
7 changed files with 146 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

276
.drone.yml
View File

File diff suppressed because it is too large Load Diff

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:12.19.0-alpine3.12 as js-builder FROM node:14.15.1-alpine3.12 as js-builder
WORKDIR /usr/src/app/ WORKDIR /usr/src/app/

2
Dockerfile.ubuntu
View File

@ -1,4 +1,4 @@
FROM node:12.19.0-slim AS js-builder FROM node:14.15.1-slim AS js-builder
WORKDIR /usr/src/app/ WORKDIR /usr/src/app/

4
package.json
View File

@ -309,9 +309,9 @@
"puppeteer": "node_modules/puppeteer-core" "puppeteer": "node_modules/puppeteer-core"
}, },
"engines": { "engines": {
"node": ">= 12" "node": ">= 14"
}, },
"volta": { "volta": {
"node": "12.19.1" "node": "14.15.1"
} }
} }

4
scripts/build/ci-build/Dockerfile
View File

@ -100,7 +100,7 @@ FROM debian:stretch-20201012
ENV GOVERSION=1.15.5 \ ENV GOVERSION=1.15.5 \
PATH=/usr/local/go/bin:$PATH \ PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \ GOPATH=/go \
NODEVERSION=12.19.1-1nodesource1 \ NODEVERSION=14.15.1-1nodesource1 \
YARNVERSION=1.22.5-1 \ YARNVERSION=1.22.5-1 \
GO111MODULE=on GO111MODULE=on
@ -135,7 +135,7 @@ RUN apt-get update && \
unzip && \ unzip && \
gem install -N fpm && \ gem install -N fpm && \
ln -s /usr/bin/llvm-dsymutil-6.0 /usr/bin/dsymutil && \ ln -s /usr/bin/llvm-dsymutil-6.0 /usr/bin/dsymutil && \
curl -fsL https://deb.nodesource.com/setup_12.x | bash - && \ curl -fsL https://deb.nodesource.com/setup_14.x | bash - && \
apt-get update && apt-get install -yq nodejs=${NODEVERSION} && \ apt-get update && apt-get install -yq nodejs=${NODEVERSION} && \
curl -fsS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ curl -fsS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \

2
scripts/build/ci-build/build-deploy.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -eo pipefail set -eo pipefail
_version="1.2.30" _version="1.3.0"
_tag="grafana/build-container:${_version}" _tag="grafana/build-container:${_version}"
_dpath=$(dirname "${BASH_SOURCE[0]}") _dpath=$(dirname "${BASH_SOURCE[0]}")

2
scripts/lib.star
View File

@ -1,5 +1,5 @@
grabpl_version = '0.5.29' grabpl_version = '0.5.29'
build_image = 'grafana/build-container:1.2.30' build_image = 'grafana/build-container:1.3.0'
publish_image = 'grafana/grafana-ci-deploy:1.2.7' publish_image = 'grafana/grafana-ci-deploy:1.2.7'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
alpine_image = 'alpine:3.12' alpine_image = 'alpine:3.12'