From 202afb904144c9eab9600f02eed512b4acf0266f Mon Sep 17 00:00:00 2001 From: Emil Tullstedt Date: Fri, 14 Apr 2023 10:01:14 +0200 Subject: [PATCH] Chore: Upgrade Go to 1.20.3 (#66264) --- .bingo/Variables.mk | 3 +- .drone.yml | 546 +++++++++++++++--------------- Dockerfile | 2 +- Makefile | 2 +- scripts/build/ci-build/Dockerfile | 2 +- scripts/drone/steps/lib.star | 4 +- 6 files changed, 280 insertions(+), 279 deletions(-) diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index 2e45d61a756..8a63fd034b0 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -33,7 +33,8 @@ DRONE := $(GOBIN)/drone-v1.5.0 $(DRONE): $(BINGO_DIR)/drone.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/drone-v1.5.0" - @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone" + @# Manual modification: CGo is disabled to make the Drone CLI build successfully on Darwin/arm64 machines. + @cd $(BINGO_DIR) && CGO_ENABLED=0 GOWORK=off $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone" GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.51.2 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod diff --git a/.drone.yml b/.drone.yml index 97ae6955df3..276d5ee3117 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -74,13 +74,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build verify-starlark . depends_on: - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: lint-starlark trigger: event: @@ -127,13 +127,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST" @@ -153,7 +153,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - yarn run ci:test-frontend @@ -162,7 +162,7 @@ steps: - clone-enterprise environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: event: @@ -216,7 +216,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -225,7 +225,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn run prettier:check @@ -237,7 +237,7 @@ steps: - clone-enterprise environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: lint-frontend trigger: event: @@ -291,7 +291,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -302,7 +302,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -312,7 +312,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -321,25 +321,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: event: @@ -388,7 +388,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST" @@ -408,13 +408,13 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - make gen-go depends_on: - clone-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update && apt-get install make @@ -423,7 +423,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.1 + image: golang:1.20.3 name: lint-backend trigger: event: @@ -478,7 +478,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -487,7 +487,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -495,18 +495,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -529,7 +529,7 @@ steps: from_secret: github_token_pr TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: trigger-test-release when: paths: @@ -556,7 +556,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -565,7 +565,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -574,7 +574,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -582,7 +582,7 @@ steps: - compile-build-cmd - yarn-install environment: null - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss @@ -593,7 +593,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ./scripts/grafana-server/start-server @@ -606,7 +606,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -709,7 +709,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-storybook when: paths: @@ -720,7 +720,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -822,7 +822,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mkdir -p bin @@ -835,7 +835,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -849,7 +849,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -858,13 +858,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -880,7 +880,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -896,7 +896,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -906,7 +906,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -916,7 +916,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: memcached-integration-tests trigger: event: @@ -968,7 +968,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - |- @@ -980,7 +980,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: codespell - commands: - yarn run prettier:checkDocs @@ -988,7 +988,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana/latest @@ -1032,13 +1032,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build shellcheck depends_on: - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: shellcheck trigger: event: @@ -1079,7 +1079,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - |- @@ -1091,7 +1091,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: codespell - commands: - yarn run prettier:checkDocs @@ -1099,7 +1099,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana/latest @@ -1152,13 +1152,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -1166,7 +1166,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: branch: main @@ -1206,7 +1206,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn run prettier:check @@ -1217,7 +1217,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: lint-frontend trigger: branch: main @@ -1259,7 +1259,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1268,7 +1268,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1276,25 +1276,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: branch: main @@ -1336,12 +1336,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update && apt-get install make @@ -1350,7 +1350,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.1 + image: golang:1.20.3 name: lint-backend - commands: - ./bin/build verify-drone @@ -1404,7 +1404,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1413,7 +1413,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1421,25 +1421,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1448,7 +1448,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1457,7 +1457,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1467,7 +1467,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -1485,7 +1485,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ./scripts/grafana-server/start-server @@ -1498,7 +1498,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -1601,7 +1601,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-storybook when: paths: @@ -1612,7 +1612,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -1656,7 +1656,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: publish-frontend-metrics when: repo: @@ -1737,7 +1737,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: release-canary-npm-packages when: repo: @@ -1841,7 +1841,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1854,7 +1854,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1862,13 +1862,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -1884,7 +1884,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -1900,7 +1900,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -1910,7 +1910,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1920,7 +1920,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: memcached-integration-tests trigger: branch: main @@ -2158,32 +2158,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -2192,7 +2192,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -2201,7 +2201,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -2211,7 +2211,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -2229,14 +2229,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -2275,7 +2275,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -2352,7 +2352,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-storybook when: event: @@ -2411,7 +2411,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: store-npm-packages trigger: event: @@ -2457,13 +2457,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2471,7 +2471,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: event: @@ -2513,7 +2513,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2522,7 +2522,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2530,25 +2530,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: event: @@ -2664,7 +2664,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2681,7 +2681,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2689,19 +2689,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2711,7 +2711,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2720,14 +2720,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - ./bin/build build-backend --jobs 8 --edition enterprise ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2736,7 +2736,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2745,7 +2745,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -2755,7 +2755,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -2773,14 +2773,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -2820,7 +2820,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -2955,7 +2955,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2972,7 +2972,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -2982,14 +2982,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2998,7 +2998,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: event: @@ -3038,7 +3038,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mkdir -p bin @@ -3061,7 +3061,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -3073,7 +3073,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3083,7 +3083,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3092,25 +3092,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: event: @@ -3246,7 +3246,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3263,7 +3263,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3271,19 +3271,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3293,7 +3293,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3302,7 +3302,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3311,7 +3311,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3321,14 +3321,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3346,7 +3346,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3366,7 +3366,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3500,7 +3500,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3517,7 +3517,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3525,19 +3525,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3547,7 +3547,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3556,7 +3556,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3565,7 +3565,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3575,14 +3575,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3600,7 +3600,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3620,7 +3620,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3746,7 +3746,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3842,7 +3842,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -3921,7 +3921,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -3990,7 +3990,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -4053,7 +4053,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -4117,7 +4117,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build publish aws --image grafana/grafana-enterprise --repo grafana-labs/grafanaenterprise @@ -4168,7 +4168,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts packages --security --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -4230,7 +4230,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -4303,12 +4303,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - ./bin/build artifacts npm retrieve --tag ${DRONE_TAG} @@ -4332,7 +4332,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: release-npm-packages trigger: event: @@ -4369,7 +4369,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4460,7 +4460,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4556,7 +4556,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4573,7 +4573,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -4581,7 +4581,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts-page @@ -4590,7 +4590,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: artifacts-page trigger: event: @@ -4635,32 +4635,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4669,7 +4669,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4678,7 +4678,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -4688,7 +4688,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -4706,14 +4706,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -4752,7 +4752,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -4829,7 +4829,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-storybook when: paths: @@ -4910,13 +4910,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4924,7 +4924,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: ref: @@ -4960,7 +4960,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4969,7 +4969,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4977,25 +4977,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: ref: @@ -5065,7 +5065,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5073,13 +5073,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -5095,7 +5095,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -5111,7 +5111,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5121,7 +5121,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5131,7 +5131,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: memcached-integration-tests trigger: ref: @@ -5237,7 +5237,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5253,7 +5253,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5261,19 +5261,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5283,7 +5283,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5292,14 +5292,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - ./bin/build build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5308,7 +5308,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5317,7 +5317,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -5327,7 +5327,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5346,14 +5346,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -5393,7 +5393,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -5534,7 +5534,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5550,7 +5550,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5560,14 +5560,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -5576,7 +5576,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: ref: @@ -5610,7 +5610,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mkdir -p bin @@ -5632,7 +5632,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5644,7 +5644,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5654,7 +5654,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5663,25 +5663,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: ref: @@ -5751,7 +5751,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5767,7 +5767,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5777,7 +5777,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5786,13 +5786,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -5808,7 +5808,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -5824,7 +5824,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5834,7 +5834,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5844,7 +5844,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: memcached-integration-tests trigger: ref: @@ -5970,7 +5970,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5986,7 +5986,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5994,19 +5994,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6016,7 +6016,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -6025,7 +6025,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -6034,7 +6034,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -6044,7 +6044,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -6052,7 +6052,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -6071,7 +6071,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -6091,7 +6091,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -6245,7 +6245,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -6253,13 +6253,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -6275,7 +6275,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -6291,7 +6291,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -6301,7 +6301,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -6311,7 +6311,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: memcached-integration-tests trigger: event: @@ -6388,7 +6388,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -6405,7 +6405,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6415,7 +6415,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -6424,13 +6424,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -6446,7 +6446,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -6462,7 +6462,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -6472,7 +6472,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -6482,7 +6482,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: memcached-integration-tests trigger: event: @@ -6635,7 +6635,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss @@ -6786,6 +6786,6 @@ kind: secret name: enterprise2_security_prefix --- kind: signature -hmac: 421b968fc475a71ac3367a4f9d2da3b6ff68208c04d28d5fd1074cf03688a52a +hmac: da82099e984231d3b292921e031655723eae03f45efac84af1a5a2104601fbfe ... diff --git a/Dockerfile b/Dockerfile index 9b6fbb2a441..621cbe5443f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=alpine:3.17 ARG JS_IMAGE=node:18-alpine3.17 ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.20.1-alpine3.17 +ARG GO_IMAGE=golang:1.20.3-alpine3.17 ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index ad161a619d8..bf9da4ea438 100644 --- a/Makefile +++ b/Makefile @@ -200,7 +200,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development. --build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \ --build-arg WIRE_TAGS=$(WIRE_TAGS) \ --build-arg BASE_IMAGE=ubuntu:20.04 \ - --build-arg GO_IMAGE=golang:1.20.1 \ + --build-arg GO_IMAGE=golang:1.20.3 \ --tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \ $(DOCKER_BUILD_ARGS) diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index d504535b647..9d3a65b388a 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -108,7 +108,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz # Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's. FROM debian:buster-20220822 -ENV GOVERSION=1.20.1 \ +ENV GOVERSION=1.20.3 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ NODEVERSION=18.12.0-1nodesource1 \ diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 749250171a6..d590436ed9c 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -9,14 +9,14 @@ load( ) grabpl_version = "v3.0.30" -build_image = "grafana/build-container:1.7.2" +build_image = "grafana/build-container:1.7.3" publish_image = "grafana/grafana-ci-deploy:1.3.3" deploy_docker_image = "us.gcr.io/kubernetes-dev/drone/plugins/deploy-image" alpine_image = "alpine:3.17.1" curl_image = "byrnedo/alpine-curl:0.1.8" windows_image = "mcr.microsoft.com/windows:1809" wix_image = "grafana/ci-wix:0.1.1" -go_image = "golang:1.20.1" +go_image = "golang:1.20.3" trigger_oss = { "repo": [