From f6d323850507749c479e07f0b4621c327bf1a3f5 Mon Sep 17 00:00:00 2001
From: Kevin Minehart <kmineh0151@gmail.com>
Date: Wed, 1 Nov 2023 11:25:49 -0500
Subject: [PATCH] CI: Fix race condition when building docker on main (#77504)

* build docker after packages are updated

* use my branch for main pipelines for testing

* use my branch for main pipelines for testing

* use main instead now

* formatting
---
 .drone.yml                         | 4 ++--
 scripts/drone/pipelines/build.star | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 40f20f172b3..f5c15812a73 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1996,7 +1996,7 @@ steps:
     docker.txt
   - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
   depends_on:
-  - yarn-install
+  - update-package-json-version
   image: grafana/grafana-build:main
   name: rgm-build-docker
   pull: always
@@ -4684,6 +4684,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 88aa054b297d39ae9757ee3a13d16b51491931fabf7c78ba0d0c125a4088da33
+hmac: 06bd63b82c56b77c48511ab3a41558122abd7df3f82c3d7b1c71f7acb8f27dc6
 
 ...
diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star
index f4d5800242c..454c684759a 100644
--- a/scripts/drone/pipelines/build.star
+++ b/scripts/drone/pipelines/build.star
@@ -113,6 +113,7 @@ def build_e2e(trigger, ver_mode):
                 rgm_build_docker_step(
                     images["ubuntu"],
                     images["alpine"],
+                    depends_on = ["update-package-json-version"],
                     tag_format = "{{ .version_base }}-{{ .buildID }}-{{ .arch }}",
                     ubuntu_tag_format = "{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}",
                 ),