From dadc8a2e2dfb60a6c069f27a2173ef819aca937d Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Fri, 5 Feb 2021 11:47:04 +0100 Subject: [PATCH] Chore: Upgrade docker build image (#30820) * Chore: Upgrade docker build image * use updated build image in drone --- .drone.yml | 322 ++++++++++++------------- scripts/build/ci-build/Dockerfile | 5 +- scripts/build/ci-build/build-deploy.sh | 2 +- scripts/lib.star | 2 +- 4 files changed, 167 insertions(+), 164 deletions(-) diff --git a/.drone.yml b/.drone.yml index b7c6146ebb1..6333a661706 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -28,7 +28,7 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: lint-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition oss environment: @@ -37,7 +37,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -45,21 +45,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition oss @@ -69,7 +69,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn run ci:test-frontend environment: @@ -78,7 +78,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --variants linux-x64,linux-x64-musl,osx64,win64 --no-pull-enterprise depends_on: @@ -87,7 +87,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -95,7 +95,7 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps depends_on: @@ -103,7 +103,7 @@ steps: - lint-backend - name: gen-version - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: @@ -117,14 +117,14 @@ steps: - check-dashboard-schemas - name: package - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --variants linux-x64,linux-x64-musl,osx64,win64 depends_on: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server @@ -144,7 +144,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -154,7 +154,7 @@ steps: - package - name: build-frontend-docs - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./scripts/ci-reference-docs-lint.sh ci depends_on: @@ -171,7 +171,7 @@ steps: - build-frontend-docs - name: copy-packages-for-docker - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -188,7 +188,7 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq postgresql-client @@ -205,7 +205,7 @@ steps: - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq default-mysql-client @@ -256,7 +256,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -282,7 +282,7 @@ steps: from_secret: drone_token - name: lint-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition oss environment: @@ -291,7 +291,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -299,21 +299,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition oss @@ -323,7 +323,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn run ci:test-frontend environment: @@ -332,7 +332,7 @@ steps: - initialize - name: publish-frontend-metrics - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY} environment: @@ -343,7 +343,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -352,7 +352,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -360,7 +360,7 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin environment: @@ -371,7 +371,7 @@ steps: - lint-backend - name: gen-version - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: @@ -385,7 +385,7 @@ steps: - check-dashboard-schemas - name: package - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign environment: @@ -403,7 +403,7 @@ steps: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server @@ -423,7 +423,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -446,14 +446,14 @@ steps: - end-to-end-tests - name: build-frontend-docs - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend - name: copy-packages-for-docker - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -484,7 +484,7 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq postgresql-client @@ -501,7 +501,7 @@ steps: - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq default-mysql-client @@ -517,7 +517,7 @@ steps: - test-frontend - name: release-canary-npm-packages - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./scripts/circle-release-canary-packages.sh environment: @@ -628,7 +628,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -713,7 +713,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -728,7 +728,7 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: lint-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition oss environment: @@ -737,7 +737,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -745,21 +745,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition oss @@ -769,7 +769,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn run ci:test-frontend environment: @@ -778,7 +778,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG} environment: @@ -790,7 +790,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition oss --no-pull-enterprise ${DRONE_TAG} depends_on: @@ -798,7 +798,7 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin environment: @@ -809,7 +809,7 @@ steps: - lint-backend - name: gen-version - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: @@ -823,7 +823,7 @@ steps: - check-dashboard-schemas - name: package - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG} environment: @@ -841,7 +841,7 @@ steps: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server @@ -861,7 +861,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -871,7 +871,7 @@ steps: - package - name: copy-packages-for-docker - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -902,7 +902,7 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq postgresql-client @@ -919,7 +919,7 @@ steps: - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq default-mysql-client @@ -962,7 +962,7 @@ steps: - end-to-end-tests - name: release-npm-packages - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./scripts/build/release-packages.sh ${DRONE_TAG} environment: @@ -1061,7 +1061,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: clone - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -1074,7 +1074,7 @@ steps: from_secret: github_token - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mv bin/grabpl /tmp/ - rmdir bin @@ -1094,7 +1094,7 @@ steps: - clone - name: lint-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition enterprise environment: @@ -1103,7 +1103,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -1111,21 +1111,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise @@ -1135,7 +1135,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn run ci:test-frontend environment: @@ -1144,7 +1144,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG} environment: @@ -1156,7 +1156,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition enterprise --no-pull-enterprise ${DRONE_TAG} depends_on: @@ -1164,7 +1164,7 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin environment: @@ -1175,7 +1175,7 @@ steps: - lint-backend - name: lint-backend-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition enterprise2 environment: @@ -1184,7 +1184,7 @@ steps: - initialize - name: test-backend-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise2 @@ -1194,7 +1194,7 @@ steps: - lint-backend-enterprise2 - name: build-backend-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG} environment: @@ -1206,7 +1206,7 @@ steps: - test-backend-enterprise2 - name: gen-version - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: @@ -1222,7 +1222,7 @@ steps: - test-backend-enterprise2 - name: package - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG} environment: @@ -1240,7 +1240,7 @@ steps: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server @@ -1262,7 +1262,7 @@ steps: - end-to-end-tests-server - name: copy-packages-for-docker - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -1293,7 +1293,7 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq postgresql-client @@ -1310,7 +1310,7 @@ steps: - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq default-mysql-client @@ -1339,7 +1339,7 @@ steps: - postgres-integration-tests - name: package-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG} environment: @@ -1357,7 +1357,7 @@ steps: - gen-version - name: end-to-end-tests-server-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server @@ -1497,7 +1497,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -1602,7 +1602,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -1617,7 +1617,7 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: lint-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition oss environment: @@ -1626,7 +1626,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -1634,21 +1634,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition oss @@ -1658,7 +1658,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn run ci:test-frontend environment: @@ -1667,7 +1667,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test environment: @@ -1679,7 +1679,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition oss --no-pull-enterprise v7.3.0-test depends_on: @@ -1687,7 +1687,7 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin environment: @@ -1698,7 +1698,7 @@ steps: - lint-backend - name: gen-version - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl gen-version v7.3.0-test depends_on: @@ -1712,7 +1712,7 @@ steps: - check-dashboard-schemas - name: package - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test environment: @@ -1730,7 +1730,7 @@ steps: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server @@ -1750,7 +1750,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -1760,7 +1760,7 @@ steps: - package - name: copy-packages-for-docker - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -1785,7 +1785,7 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq postgresql-client @@ -1802,7 +1802,7 @@ steps: - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq default-mysql-client @@ -1842,7 +1842,7 @@ steps: - end-to-end-tests - name: release-npm-packages - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 environment: GITHUB_PACKAGE_TOKEN: from_secret: github_package_token @@ -1939,7 +1939,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: clone - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -1952,7 +1952,7 @@ steps: from_secret: github_token - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mv bin/grabpl /tmp/ - rmdir bin @@ -1972,7 +1972,7 @@ steps: - clone - name: lint-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition enterprise environment: @@ -1981,7 +1981,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -1989,21 +1989,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise @@ -2013,7 +2013,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn run ci:test-frontend environment: @@ -2022,7 +2022,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test environment: @@ -2034,7 +2034,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition enterprise --no-pull-enterprise v7.3.0-test depends_on: @@ -2042,7 +2042,7 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin environment: @@ -2053,7 +2053,7 @@ steps: - lint-backend - name: lint-backend-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition enterprise2 environment: @@ -2062,7 +2062,7 @@ steps: - initialize - name: test-backend-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise2 @@ -2072,7 +2072,7 @@ steps: - lint-backend-enterprise2 - name: build-backend-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test environment: @@ -2084,7 +2084,7 @@ steps: - test-backend-enterprise2 - name: gen-version - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl gen-version v7.3.0-test depends_on: @@ -2100,7 +2100,7 @@ steps: - test-backend-enterprise2 - name: package - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test environment: @@ -2118,7 +2118,7 @@ steps: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server @@ -2140,7 +2140,7 @@ steps: - end-to-end-tests-server - name: copy-packages-for-docker - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -2165,7 +2165,7 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq postgresql-client @@ -2182,7 +2182,7 @@ steps: - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq default-mysql-client @@ -2211,7 +2211,7 @@ steps: - postgres-integration-tests - name: package-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test environment: @@ -2229,7 +2229,7 @@ steps: - gen-version - name: end-to-end-tests-server-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server @@ -2369,7 +2369,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -2474,7 +2474,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -2488,7 +2488,7 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: lint-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition oss environment: @@ -2497,7 +2497,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -2505,21 +2505,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition oss @@ -2529,7 +2529,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn run ci:test-frontend environment: @@ -2538,7 +2538,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -2547,7 +2547,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -2555,7 +2555,7 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin environment: @@ -2566,7 +2566,7 @@ steps: - lint-backend - name: gen-version - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: @@ -2580,7 +2580,7 @@ steps: - check-dashboard-schemas - name: package - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign environment: @@ -2598,7 +2598,7 @@ steps: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server @@ -2618,7 +2618,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -2628,7 +2628,7 @@ steps: - package - name: copy-packages-for-docker - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -2653,7 +2653,7 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq postgresql-client @@ -2670,7 +2670,7 @@ steps: - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq default-mysql-client @@ -2782,7 +2782,7 @@ steps: - echo $DRONE_RUNNER_NAME - name: clone - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.36/grabpl @@ -2795,7 +2795,7 @@ steps: from_secret: github_token - name: initialize - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - mv bin/grabpl /tmp/ - rmdir bin @@ -2814,7 +2814,7 @@ steps: - clone - name: lint-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition enterprise environment: @@ -2823,7 +2823,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -2831,21 +2831,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise @@ -2855,7 +2855,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn run ci:test-frontend environment: @@ -2864,7 +2864,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -2873,7 +2873,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -2881,7 +2881,7 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin environment: @@ -2892,7 +2892,7 @@ steps: - lint-backend - name: lint-backend-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl lint-backend --edition enterprise2 environment: @@ -2901,7 +2901,7 @@ steps: - initialize - name: test-backend-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise2 @@ -2911,7 +2911,7 @@ steps: - lint-backend-enterprise2 - name: build-backend-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} --variants linux-x64 --no-pull-enterprise depends_on: @@ -2920,7 +2920,7 @@ steps: - test-backend-enterprise2 - name: gen-version - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: @@ -2936,7 +2936,7 @@ steps: - test-backend-enterprise2 - name: package - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign environment: @@ -2954,7 +2954,7 @@ steps: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server @@ -2976,7 +2976,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -2986,7 +2986,7 @@ steps: - package - name: copy-packages-for-docker - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -3011,7 +3011,7 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq postgresql-client @@ -3028,7 +3028,7 @@ steps: - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - apt-get update - apt-get install -yq default-mysql-client @@ -3057,7 +3057,7 @@ steps: - postgres-integration-tests - name: package-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 commands: - ./bin/grabpl package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --variants linux-x64 --sign environment: @@ -3075,7 +3075,7 @@ steps: - gen-version - name: end-to-end-tests-server-enterprise2 - image: grafana/build-container:1.3.1 + image: grafana/build-container:1.3.2 detach: true commands: - ./e2e/start-server diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index ca02f0dd8c2..fdad903b1bb 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -3,6 +3,7 @@ FROM debian:stretch-20201209 AS toolchain ENV OSX_MIN=10.10 \ CTNG=1.24.0 \ + CTNG_CHKSUM=89b8794a4184ad4928750e29712ed4f194aa1d0b93768d67ff64f30c30f1b1e165647cafc6de94d68d3ef70e50446e544dad65aa36137511a32ee7a667dddfb4 \ # This is the last revision that builds on Debian Stretch OSX_CROSS_REV=a1d7d7a8d569f9f0b8c3140b8b32848dbcd62afa @@ -56,7 +57,9 @@ RUN rm -rf /tmp/osxcross/target/SDK/*/usr/share && \ rm -rf /tmp/osxcross RUN apt-get install -yq \ unzip libtool-bin bison flex gawk gcc g++ gperf help2man libncurses5-dev make patch python-dev texinfo xz-utils -RUN curl -fL http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-${CTNG}.tar.xz | tar -xJ -C /tmp/ +RUN curl -fLO http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-${CTNG}.tar.xz +RUN echo $CTNG_CHKSUM crosstool-ng-${CTNG}.tar.xz | sha512sum --check --strict --status +RUN tar xf crosstool-ng-${CTNG}.tar.xz RUN cd /tmp/crosstool-ng-${CTNG} && \ ./configure --enable-local && \ make && \ diff --git a/scripts/build/ci-build/build-deploy.sh b/scripts/build/ci-build/build-deploy.sh index b63bb9583e2..42204a7452e 100755 --- a/scripts/build/ci-build/build-deploy.sh +++ b/scripts/build/ci-build/build-deploy.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eo pipefail -_version="1.3.1" +_version="1.3.2" _tag="grafana/build-container:${_version}" _dpath=$(dirname "${BASH_SOURCE[0]}") diff --git a/scripts/lib.star b/scripts/lib.star index 023fb951318..1f9b6a0479d 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -1,5 +1,5 @@ grabpl_version = '0.5.36' -build_image = 'grafana/build-container:1.3.1' +build_image = 'grafana/build-container:1.3.2' publish_image = 'grafana/grafana-ci-deploy:1.3.0' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' alpine_image = 'alpine:3.12'