Skip to content

Commit 473f004

Browse files
authored
Drone: Fix docker buildx usage (#471)
1 parent d284d5f commit 473f004

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.drone.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ steps:
213213
DOCKER_USER:
214214
from_secret: docker_user
215215
IMAGE_NAME: grafana/grafana-image-renderer
216-
image: google/cloud-sdk:412.0.0
216+
image: google/cloud-sdk:449.0.0
217217
name: publish_to_docker_master
218218
volumes:
219219
- name: docker
@@ -350,7 +350,7 @@ steps:
350350
DOCKER_USER:
351351
from_secret: docker_user
352352
IMAGE_NAME: grafana/grafana-image-renderer
353-
image: google/cloud-sdk:412.0.0
353+
image: google/cloud-sdk:449.0.0
354354
name: publish_to_docker
355355
volumes:
356356
- name: docker
@@ -414,6 +414,6 @@ kind: secret
414414
name: srcclr_api_token
415415
---
416416
kind: signature
417-
hmac: f130230eb86344632de732a9fa4fe1155c622537fbe3c61d9fc1d8b17a4cacea
417+
hmac: eeb3dd651cc32e9e32188e7f904e97131911d9699c7610c4b33a19098c257d9f
418418

419419
...

scripts/build_push_docker.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,9 @@ if [ -z "$(echo $TAG | grep -E "beta|master")" ]; then
1717
tags+=("-t ${IMAGE_NAME}:latest")
1818
fi
1919

20+
# The default Docker builder does not support multiple platforms, so this creates a non-default builder that does support multiple platforms.
21+
if ! docker buildx inspect | grep -E 'Driver:\s+docker-container' >/dev/null; then
22+
docker buildx create --use
23+
fi
24+
2025
docker buildx build --platform linux/amd64,linux/arm64 --push ${tags[@]} .

scripts/drone/promotion.star

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def publish_to_docker_release():
3434
def publish_to_docker():
3535
return {
3636
'name': 'publish_to_docker',
37-
'image': 'google/cloud-sdk:412.0.0',
37+
'image': 'google/cloud-sdk:449.0.0',
3838
'environment': {
3939
'IMAGE_NAME': docker_image,
4040
'DOCKER_USER': from_secret('docker_user'),

0 commit comments

Comments
 (0)