From beee65fb8339423f2e76b4cf6ed82d0d04cc6a55 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Thu, 13 Feb 2025 05:00:32 +0000 Subject: [PATCH] [release-11.2.7] Chore: pin tonistiigi/binfmt version (#100526) Chore: pin tonistiigi/binfmt version (#100510) * Chore: pin tonistiigi/binfmt version * change version to qemu-v7.0.0-28 * uninstall first, log version * uninstall first, log version * uninstall first, log version (cherry picked from commit a9b4b1e5be23e4bd30dce11fc738f4ff4a6111b5) --- .drone.yml | 16 +++++++++++++--- scripts/drone/steps/rgm.star | 7 ++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4f8cd575a95..89ae66d6846 100644 --- a/.drone.yml +++ b/.drone.yml @@ -696,6 +696,9 @@ steps: token: from_secret: drone_token - commands: + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --version + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*' + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 -a targz:grafana:linux/arm/v7 --go-version=1.22.11 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt @@ -937,7 +940,9 @@ steps: image: grafana/docker-puppeteer:1.1.0 name: test-a11y-frontend - commands: - - docker run --privileged --rm tonistiigi/binfmt --install all + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --version + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*' + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER @@ -2164,6 +2169,9 @@ steps: image: node:20.9.0-alpine name: build-frontend-packages - commands: + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --version + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*' + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 -a targz:grafana:linux/arm/v7 --go-version=1.22.11 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt @@ -2441,7 +2449,9 @@ steps: repo: - grafana/grafana - commands: - - docker run --privileged --rm tonistiigi/binfmt --install all + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --version + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*' + - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER @@ -5695,6 +5705,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 9dba5de262900d1fccd24fdd7ca8ddc5fe4595344af0365796b522efcffa3319 +hmac: a812aa5256b686f7422b378d66f25eb0d096afbbf2ce8cc200c7984e01601876 ... diff --git a/scripts/drone/steps/rgm.star b/scripts/drone/steps/rgm.star index 7890bc3955e..92fec4b3e65 100644 --- a/scripts/drone/steps/rgm.star +++ b/scripts/drone/steps/rgm.star @@ -34,6 +34,9 @@ def rgm_artifacts_step(name = "rgm-package", artifacts = ["targz:grafana:linux/a "_EXPERIMENTAL_DAGGER_CLOUD_TOKEN": from_secret(rgm_dagger_token), }, "commands": [ + "docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --version", + "docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*'", + "docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all", cmd + "--go-version={} ".format(golang_version) + "--yarn-cache=$$YARN_CACHE_FOLDER " + @@ -58,7 +61,9 @@ def rgm_build_docker_step(ubuntu, alpine, depends_on = ["yarn-install"], file = "_EXPERIMENTAL_DAGGER_CLOUD_TOKEN": from_secret(rgm_dagger_token), }, "commands": [ - "docker run --privileged --rm tonistiigi/binfmt --install all", + "docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --version", + "docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*'", + "docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all", "/src/grafana-build artifacts " + "-a docker:grafana:linux/amd64 " + "-a docker:grafana:linux/amd64:ubuntu " +