mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
This reverts commit 0a9129cf90.
This commit is contained in:
@@ -105,7 +105,7 @@ FROM debian:buster-20220822
|
||||
ENV GOVERSION=1.19.3 \
|
||||
PATH=/usr/local/go/bin:$PATH \
|
||||
GOPATH=/go \
|
||||
NODEVERSION=18.12.0-1nodesource1 \
|
||||
NODEVERSION=16.14.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_18.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\
|
||||
curl -O https://deb.nodesource.com/node_16.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 - && \
|
||||
|
||||
@@ -14,5 +14,3 @@ 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.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
|
||||
|
||||
grabpl_version = 'v3.0.16'
|
||||
build_image = 'grafana/build-container:1.6.5'
|
||||
build_image = 'grafana/build-container:1.6.4'
|
||||
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'
|
||||
|
||||
Reference in New Issue
Block a user