Chore: Move to node 18 again (#62079)

move to node 18 again
This commit is contained in:
Ashley Harrison
2023-01-26 10:19:39 +00:00
committed by GitHub
parent 9f7ddf1f0b
commit 64352e8d08
11 changed files with 233 additions and 231 deletions

View File

@@ -105,7 +105,7 @@ FROM debian:buster-20220822
ENV GOVERSION=1.19.4 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=16.14.0-1nodesource1 \
NODEVERSION=18.12.0-1nodesource1 \
YARNVERSION=1.22.19-1
# Use ARG so as not to persist environment variable in image
@@ -141,7 +141,7 @@ RUN apt-get update && \
gem install --conservative -N fpm && \
ln -s /usr/bin/llvm-dsymutil-6.0 /usr/bin/dsymutil && \
curl -fsS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
curl -O https://deb.nodesource.com/node_16.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\
curl -O https://deb.nodesource.com/node_18.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\
dpkg -i nodejs_${NODEVERSION}_amd64.deb &&\
rm nodejs_${NODEVERSION}_amd64.deb &&\
curl -fsS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

View File

@@ -14,3 +14,5 @@ In order to build and publish the Grafana build Docker image, execute the follow
docker build -t grafana/build-container:<VERSION> .
docker push grafana/build-container:<VERSION>
```
If you're running on a machine that has an ARM chip (Apple M1/M2, etc.), add `--platform linux/amd64` to the `docker build` command. It can take approximately four hours for an initial build to complete. Due to caching, subsequent builds take less time (~10 mins or so).

View File

@@ -6,7 +6,7 @@ load(
)
grabpl_version = 'v3.0.20'
build_image = 'grafana/build-container:1.6.6'
build_image = 'grafana/build-container:1.6.7'
publish_image = 'grafana/grafana-ci-deploy:1.3.3'
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
alpine_image = 'alpine:3.15.6'