From cbc2eb8cd9e949168bc86437f9f37e896fe372ed Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Thu, 13 Feb 2025 06:01:00 +0100 Subject: [PATCH] [release-11.0.11] Chore: pin tonistiigi/binfmt version (#100522) * 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) * ci(drone): align rgm.star rgm_artifacts_step --------- Co-authored-by: Josh Hunt --- .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 daa756852c1..e295b9be88e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -653,6 +653,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 @@ -861,7 +864,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 @@ -2044,6 +2049,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 @@ -2288,7 +2296,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 @@ -5000,6 +5010,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 96089968975cb4a38935a6743e1bf3b9f3625127a817411fe8cbeceab8551a47 +hmac: ff15ac61c0fe96e1b35202075ebc9e9c43ed9d776187cd2aac9a4f25a34a2570 ... 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 " +