From 433f0570cfb30285fc47ea43f97276076e3fe4a2 Mon Sep 17 00:00:00 2001 From: idafurjes <36131195+idafurjes@users.noreply.github.com> Date: Mon, 10 Jan 2022 11:30:07 +0100 Subject: [PATCH] Chore: Upgrade go and alpine (#43801) (#43846) * Upgrade go and alpine * Bump grabpl version * Bump alpine version * Fix version of grabpl * Bump alpine version * Bump alpine in Dockerfiles (cherry picked from commit 3ca58c0e0c99acad663606d2f82ff2305585f1cb) --- .drone.yml | 442 +++++++++++++++++------------------ Dockerfile | 6 +- Dockerfile.ubuntu | 4 +- packaging/docker/Dockerfile | 2 +- packaging/docker/build.sh | 2 +- scripts/drone/steps/lib.star | 6 +- 6 files changed, 231 insertions(+), 231 deletions(-) diff --git a/.drone.yml b/.drone.yml index e74b78cae48..f7acb0fa35c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,19 +11,19 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - ./bin/grabpl verify-drone @@ -43,13 +43,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -57,7 +57,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend - commands: - yarn run prettier:check @@ -67,19 +67,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -87,7 +87,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-frontend trigger: event: @@ -112,19 +112,19 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -132,7 +132,7 @@ steps: depends_on: - initialize environment: {} - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id @@ -141,20 +141,20 @@ steps: - initialize environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps depends_on: - initialize environment: null - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -175,7 +175,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: ensure-cuetsified - commands: - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss @@ -185,7 +185,7 @@ steps: - build-backend - build-frontend environment: null - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package - commands: - yarn run cypress install @@ -203,7 +203,7 @@ steps: detach: true environment: PORT: 3001 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite @@ -256,7 +256,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-storybook - commands: - yarn wait-on http://$HOST:$PORT @@ -275,7 +275,7 @@ steps: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-frontend-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -290,7 +290,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: copy-packages-for-docker - depends_on: - copy-packages-for-docker @@ -344,19 +344,19 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - apt-get update @@ -371,7 +371,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: postgres-integration-tests - commands: - apt-get update @@ -386,7 +386,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: mysql-integration-tests trigger: event: @@ -417,19 +417,19 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - ./bin/grabpl verify-drone @@ -449,13 +449,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -463,7 +463,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend - commands: - yarn run prettier:check @@ -473,19 +473,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -493,7 +493,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-frontend trigger: branch: main @@ -519,19 +519,19 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - image: grafana/drone-downstream name: trigger-enterprise-downstream @@ -550,7 +550,7 @@ steps: depends_on: - initialize environment: {} - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id @@ -559,7 +559,7 @@ steps: - initialize environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin @@ -568,13 +568,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -595,7 +595,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise @@ -615,7 +615,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package - commands: - yarn run cypress install @@ -633,7 +633,7 @@ steps: detach: true environment: PORT: 3001 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite @@ -686,7 +686,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-storybook - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -726,20 +726,20 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: publish-frontend-metrics - commands: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-frontend-docs - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: copy-packages-for-docker - depends_on: - copy-packages-for-docker @@ -775,7 +775,7 @@ steps: environment: GITHUB_PACKAGE_TOKEN: from_secret: github_package_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: release-canary-npm-packages - commands: - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads @@ -852,19 +852,19 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - apt-get update @@ -879,7 +879,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: postgres-integration-tests - commands: - apt-get update @@ -894,7 +894,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: mysql-integration-tests trigger: branch: main @@ -932,7 +932,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: initialize @@ -987,17 +987,17 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -1092,20 +1092,20 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - ./bin/grabpl verify-version ${DRONE_TAG} - ./bin/grabpl gen-version ${DRONE_TAG} - yarn install --immutable - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - |- @@ -1119,13 +1119,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -1133,7 +1133,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend - commands: - yarn run prettier:check @@ -1143,19 +1143,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -1163,7 +1163,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-frontend - commands: - apt-get update @@ -1178,7 +1178,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: postgres-integration-tests - commands: - apt-get update @@ -1193,7 +1193,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} @@ -1203,7 +1203,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps @@ -1212,7 +1212,7 @@ steps: - initialize environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin @@ -1221,13 +1221,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -1248,7 +1248,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise @@ -1268,7 +1268,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package - commands: - yarn run cypress install @@ -1286,7 +1286,7 @@ steps: detach: true environment: PORT: 3001 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -1337,7 +1337,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: copy-packages-for-docker - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -1374,7 +1374,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition oss --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets" @@ -1423,7 +1423,7 @@ steps: - ./scripts/build/build-npm-packages.sh ${DRONE_TAG} depends_on: - store-storybook - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-npm-packages - commands: - ./scripts/build/store-npm-packages.sh ${DRONE_TAG} @@ -1472,7 +1472,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: initialize @@ -1555,13 +1555,13 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -1570,7 +1570,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -1590,7 +1590,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - |- @@ -1604,13 +1604,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition enterprise @@ -1618,7 +1618,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend - commands: - yarn run prettier:check @@ -1628,19 +1628,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend - commands: - ./bin/grabpl integration-tests --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -1648,7 +1648,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-frontend - commands: - apt-get update @@ -1663,7 +1663,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: postgres-integration-tests - commands: - apt-get update @@ -1678,7 +1678,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} @@ -1688,7 +1688,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps @@ -1697,7 +1697,7 @@ steps: - initialize environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign @@ -1707,13 +1707,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -1734,7 +1734,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: ensure-cuetsified - commands: - ./bin/grabpl lint-backend --edition enterprise2 @@ -1742,19 +1742,19 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend-enterprise2 - commands: - ./bin/grabpl test-backend --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-enterprise2 - commands: - ./bin/grabpl integration-tests --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration-enterprise2 - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} @@ -1764,7 +1764,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend-enterprise2 - commands: - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} @@ -1786,7 +1786,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package - commands: - yarn run cypress install @@ -1806,7 +1806,7 @@ steps: PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz PORT: 3001 RUNDIR: e2e/tmp-grafana-enterprise - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -1857,7 +1857,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: copy-packages-for-docker - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -1894,7 +1894,7 @@ steps: - initialize environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1903,7 +1903,7 @@ steps: - initialize environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: memcached-integration-tests - commands: - ./bin/grabpl upload-cdn --edition enterprise --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets" @@ -1949,7 +1949,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets" @@ -2015,7 +2015,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -2108,20 +2108,20 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - ./bin/grabpl verify-version v7.3.0-test - ./bin/grabpl gen-version v7.3.0-test - yarn install --immutable - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - |- @@ -2135,13 +2135,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -2149,7 +2149,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend - commands: - yarn run prettier:check @@ -2159,19 +2159,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -2179,7 +2179,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-frontend - commands: - apt-get update @@ -2194,7 +2194,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: postgres-integration-tests - commands: - apt-get update @@ -2209,7 +2209,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} @@ -2219,7 +2219,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps @@ -2228,7 +2228,7 @@ steps: - initialize environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin @@ -2237,13 +2237,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -2264,7 +2264,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise @@ -2284,7 +2284,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package - commands: - yarn run cypress install @@ -2302,7 +2302,7 @@ steps: detach: true environment: PORT: 3001 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -2353,7 +2353,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: copy-packages-for-docker - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -2390,7 +2390,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" @@ -2465,7 +2465,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: initialize @@ -2546,13 +2546,13 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -2561,7 +2561,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2580,7 +2580,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - |- @@ -2594,13 +2594,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition enterprise @@ -2608,7 +2608,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend - commands: - yarn run prettier:check @@ -2618,19 +2618,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend - commands: - ./bin/grabpl integration-tests --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -2638,7 +2638,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-frontend - commands: - apt-get update @@ -2653,7 +2653,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: postgres-integration-tests - commands: - apt-get update @@ -2668,7 +2668,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} @@ -2678,7 +2678,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps @@ -2687,7 +2687,7 @@ steps: - initialize environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign @@ -2697,13 +2697,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -2724,7 +2724,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: ensure-cuetsified - commands: - ./bin/grabpl lint-backend --edition enterprise2 @@ -2732,19 +2732,19 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend-enterprise2 - commands: - ./bin/grabpl test-backend --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-enterprise2 - commands: - ./bin/grabpl integration-tests --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration-enterprise2 - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} @@ -2754,7 +2754,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend-enterprise2 - commands: - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} @@ -2776,7 +2776,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package - commands: - yarn run cypress install @@ -2796,7 +2796,7 @@ steps: PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz PORT: 3001 RUNDIR: e2e/tmp-grafana-enterprise - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -2847,7 +2847,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: copy-packages-for-docker - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -2884,7 +2884,7 @@ steps: - grabpl environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2893,7 +2893,7 @@ steps: - grabpl environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: memcached-integration-tests - commands: - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets" @@ -2939,7 +2939,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets" @@ -3002,7 +3002,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -3077,18 +3077,18 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - ./bin/grabpl verify-version v7.3.0-test - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -3204,19 +3204,19 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - make gen-go - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - yarn install --immutable - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - |- @@ -3230,13 +3230,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -3244,7 +3244,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend - commands: - yarn run prettier:check @@ -3254,19 +3254,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -3274,7 +3274,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-frontend - commands: - apt-get update @@ -3289,7 +3289,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: postgres-integration-tests - commands: - apt-get update @@ -3304,7 +3304,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -3312,7 +3312,7 @@ steps: depends_on: - initialize environment: {} - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id @@ -3321,7 +3321,7 @@ steps: - initialize environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin @@ -3330,13 +3330,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -3357,7 +3357,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise @@ -3377,7 +3377,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package - commands: - yarn run cypress install @@ -3395,7 +3395,7 @@ steps: detach: true environment: PORT: 3001 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -3446,7 +3446,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: copy-packages-for-docker - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -3483,7 +3483,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" @@ -3543,7 +3543,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: initialize @@ -3619,13 +3619,13 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.3 + image: alpine:3.15 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -3634,7 +3634,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3652,7 +3652,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: initialize - commands: - |- @@ -3666,13 +3666,13 @@ steps: - rm words_to_ignore.txt depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition enterprise @@ -3680,7 +3680,7 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend - commands: - yarn run prettier:check @@ -3690,19 +3690,19 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend - commands: - ./bin/grabpl integration-tests --edition enterprise depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -3710,7 +3710,7 @@ steps: - initialize environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-frontend - commands: - apt-get update @@ -3725,7 +3725,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: postgres-integration-tests - commands: - apt-get update @@ -3740,7 +3740,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: mysql-integration-tests - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -3748,7 +3748,7 @@ steps: depends_on: - initialize environment: {} - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition enterprise --build-id @@ -3757,7 +3757,7 @@ steps: - initialize environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-frontend - commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign @@ -3767,13 +3767,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: validate-scuemata - commands: - '# Make sure the git tree is clean.' @@ -3794,7 +3794,7 @@ steps: - git stash pop depends_on: - validate-scuemata - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: ensure-cuetsified - commands: - ./bin/grabpl lint-backend --edition enterprise2 @@ -3802,19 +3802,19 @@ steps: - initialize environment: CGO_ENABLED: "1" - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: lint-backend-enterprise2 - commands: - ./bin/grabpl test-backend --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-enterprise2 - commands: - ./bin/grabpl integration-tests --edition enterprise2 depends_on: - initialize - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: test-backend-integration-enterprise2 - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -3822,7 +3822,7 @@ steps: depends_on: - initialize environment: {} - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-backend-enterprise2 - commands: - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -3844,7 +3844,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package - commands: - yarn run cypress install @@ -3864,7 +3864,7 @@ steps: PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz PORT: 3001 RUNDIR: e2e/tmp-grafana-enterprise - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: end-to-end-tests-server - commands: - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 @@ -3915,7 +3915,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: copy-packages-for-docker - commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json @@ -3952,7 +3952,7 @@ steps: - build-frontend environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: build-storybook - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -3961,7 +3961,7 @@ steps: - initialize environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3970,7 +3970,7 @@ steps: - initialize environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: memcached-integration-tests - commands: - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets" @@ -4016,7 +4016,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.4.8 + image: grafana/build-container:1.4.9 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets" @@ -4079,7 +4079,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.8/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.9/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -4193,6 +4193,6 @@ kind: secret name: prerelease_bucket --- kind: signature -hmac: 897e8fbc0f37c7f8172d757bd2fb06b09674b53a331cfa0b34ed090c4e9cbb5a +hmac: ffd99bd1519b1f5f0cfaed3bfb8fed0aa235e114e14296fcf02b226e49117a59 ... diff --git a/Dockerfile b/Dockerfile index 88790ce372d..e70ed3f1742 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-alpine3.14 as js-builder +FROM node:16-alpine3.15 as js-builder ENV NODE_OPTIONS=--max_old_space_size=8000 @@ -20,7 +20,7 @@ COPY emails emails ENV NODE_ENV production RUN yarn build -FROM golang:1.17.3-alpine3.14 as go-builder +FROM golang:1.17.6-alpine3.15 as go-builder RUN apk add --no-cache gcc g++ make @@ -39,7 +39,7 @@ RUN go mod verify RUN make build-go # Final stage -FROM alpine:3.14.3 +FROM alpine:3.15 LABEL maintainer="Grafana team " diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 90df9cb8e42..256962b373d 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM node:16-alpine3.14 as js-builder +FROM node:16-alpine3.15 as js-builder ENV NODE_OPTIONS=--max_old_space_size=8000 @@ -21,7 +21,7 @@ COPY emails emails ENV NODE_ENV production RUN yarn build -FROM golang:1.17.3 AS go-builder +FROM golang:1.17.6 AS go-builder WORKDIR /src/grafana diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index e37e270005d..012391b7cb4 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.14.3 +ARG BASE_IMAGE=alpine:3.15 FROM ${BASE_IMAGE} ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz" diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh index 991508be47b..533284ac8af 100755 --- a/packaging/docker/build.sh +++ b/packaging/docker/build.sh @@ -60,7 +60,7 @@ docker_build () { if [ $UBUNTU_BASE = "0" ]; then libc="-musl" dockerfile="Dockerfile" - base_image="${base_arch}alpine:3.14.3" + base_image="${base_arch}alpine:3.15" else libc="" dockerfile="ubuntu.Dockerfile" diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 327094c34a4..7d1659f3335 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1,11 +1,11 @@ load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket') -grabpl_version = '2.7.8' -build_image = 'grafana/build-container:1.4.8' +grabpl_version = '2.7.9' +build_image = 'grafana/build-container:1.4.9' publish_image = 'grafana/grafana-ci-deploy:1.3.1' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' -alpine_image = 'alpine:3.14.3' +alpine_image = 'alpine:3.15' curl_image = 'byrnedo/alpine-curl:0.1.8' windows_image = 'mcr.microsoft.com/windows:1809' wix_image = 'grafana/ci-wix:0.1.1'