Commit 00d59ec1 by Torkel Ödegaard Committed by GitHub

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

* 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>
parent 18c3f7bb
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/
......
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/
......
...@@ -309,9 +309,9 @@ ...@@ -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"
} }
} }
...@@ -100,7 +100,7 @@ FROM debian:stretch-20201012 ...@@ -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 && \ ...@@ -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 && \
......
#!/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]}")
......
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'
......
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