Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 769114b

Browse files
aangelisckminehart
aangelisc
and
kminehart
authored
[v10.4.x] CI: Fix drone docker publish (#91208)
CI: Fix drone docker publish (#91204) * $debug -> $$debug * use bash instead of sh * Update publish_images.star * Install bash in the docker/docker image * buildifier (cherry picked from commit bee678d) # Conflicts: # .drone.yml Co-authored-by: Kevin Minehart <[email protected]>
1 parent da7dea8 commit 769114b

File tree

2 files changed

+89
-58
lines changed

2 files changed

+89
-58
lines changed

‎.drone.yml‎

Lines changed: 69 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2593,26 +2593,40 @@ steps:
25932593
- name: docker
25942594
path: /var/run/docker.sock
25952595
- commands:
2596-
- "\n debug=\n if [[ -n $${DRY_RUN} ]]; then debug=echo; fi\n docker login
2597-
-u $${DOCKER_USER} -p $${DOCKER_PASSWORD}\n\n # Push the grafana-image-tags
2598-
images\n $debug docker push grafana/grafana-image-tags:$${TAG}-amd64\n $debug
2599-
docker push grafana/grafana-image-tags:$${TAG}-arm64\n $debug docker push grafana/grafana-image-tags:$${TAG}-armv7\n
2600-
\ $debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-amd64\n $debug
2601-
docker push grafana/grafana-image-tags:$${TAG}-ubuntu-arm64\n $debug docker
2602-
push grafana/grafana-image-tags:$${TAG}-ubuntu-armv7\n\n # Create the grafana
2603-
manifests\n $debug docker manifest create grafana/grafana:${TAG} grafana/grafana-image-tags:$${TAG}-amd64
2604-
\ grafana/grafana-image-tags:$${TAG}-arm64 grafana/grafana-image-tags:$${TAG}-armv7\n\n
2605-
\ $debug docker manifest create grafana/grafana:${TAG}-ubuntu grafana/grafana-image-tags:$${TAG}-ubuntu-amd64
2606-
\ grafana/grafana-image-tags:$${TAG}-ubuntu-arm64 grafana/grafana-image-tags:$${TAG}-ubuntu-armv7\n\n
2607-
\ # Push the grafana manifests\n $debug docker manifest push grafana/grafana:$${TAG}\n
2608-
\ $debug docker manifest push grafana/grafana:$${TAG}-ubuntu\n\n # if LATEST
2609-
is set, then also create & push latest\n if [[ -n $${LATEST} ]]; then\n $debug
2610-
docker manifest create grafana/grafana:latest grafana/grafana-image-tags:$${TAG}-amd64
2611-
\ grafana/grafana-image-tags:$${TAG}-arm64 grafana/grafana-image-tags:$${TAG}-armv7\n
2612-
\ $debug docker manifest create grafana/grafana:latest-ubuntu grafana/grafana-image-tags:$${TAG}-ubuntu-amd64
2613-
\ grafana/grafana-image-tags:$${TAG}-ubuntu-arm64 grafana/grafana-image-tags:$${TAG}-ubuntu-armv7\n\n
2614-
\ $debug docker manifest push grafana/grafana:latest\n $debug docker
2615-
manifest push grafana/grafana:latest-ubuntu\n\n fi\n "
2596+
- apk add bash
2597+
- |2-
2598+
2599+
bash -c '
2600+
debug=
2601+
if [[ -n $${DRY_RUN} ]]; then debug=echo; fi
2602+
docker login -u $${DOCKER_USER} -p $${DOCKER_PASSWORD}
2603+
2604+
# Push the grafana-image-tags images
2605+
$$debug docker push grafana/grafana-image-tags:$${TAG}-amd64
2606+
$$debug docker push grafana/grafana-image-tags:$${TAG}-arm64
2607+
$$debug docker push grafana/grafana-image-tags:$${TAG}-armv7
2608+
$$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-amd64
2609+
$$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-arm64
2610+
$$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-armv7
2611+
2612+
# Create the grafana manifests
2613+
$$debug docker manifest create grafana/grafana:${TAG} grafana/grafana-image-tags:$${TAG}-amd64 grafana/grafana-image-tags:$${TAG}-arm64 grafana/grafana-image-tags:$${TAG}-armv7
2614+
2615+
$$debug docker manifest create grafana/grafana:${TAG}-ubuntu grafana/grafana-image-tags:$${TAG}-ubuntu-amd64 grafana/grafana-image-tags:$${TAG}-ubuntu-arm64 grafana/grafana-image-tags:$${TAG}-ubuntu-armv7
2616+
2617+
# Push the grafana manifests
2618+
$$debug docker manifest push grafana/grafana:$${TAG}
2619+
$$debug docker manifest push grafana/grafana:$${TAG}-ubuntu
2620+
2621+
# if LATEST is set, then also create & push latest
2622+
if [[ -n $${LATEST} ]]; then
2623+
$$debug docker manifest create grafana/grafana:latest grafana/grafana-image-tags:$${TAG}-amd64 grafana/grafana-image-tags:$${TAG}-arm64 grafana/grafana-image-tags:$${TAG}-armv7
2624+
$$debug docker manifest create grafana/grafana:latest-ubuntu grafana/grafana-image-tags:$${TAG}-ubuntu-amd64 grafana/grafana-image-tags:$${TAG}-ubuntu-arm64 grafana/grafana-image-tags:$${TAG}-ubuntu-armv7
2625+
2626+
$$debug docker manifest push grafana/grafana:latest
2627+
$$debug docker manifest push grafana/grafana:latest-ubuntu
2628+
2629+
fi'
26162630
depends_on:
26172631
- fetch-images
26182632
environment:
@@ -2710,26 +2724,40 @@ steps:
27102724
- name: docker
27112725
path: /var/run/docker.sock
27122726
- commands:
2713-
- "\n debug=\n if [[ -n $${DRY_RUN} ]]; then debug=echo; fi\n docker login
2714-
-u $${DOCKER_USER} -p $${DOCKER_PASSWORD}\n\n # Push the grafana-image-tags
2715-
images\n $debug docker push grafana/grafana-image-tags:$${TAG}-amd64\n $debug
2716-
docker push grafana/grafana-image-tags:$${TAG}-arm64\n $debug docker push grafana/grafana-image-tags:$${TAG}-armv7\n
2717-
\ $debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-amd64\n $debug
2718-
docker push grafana/grafana-image-tags:$${TAG}-ubuntu-arm64\n $debug docker
2719-
push grafana/grafana-image-tags:$${TAG}-ubuntu-armv7\n\n # Create the grafana
2720-
manifests\n $debug docker manifest create grafana/grafana:${TAG} grafana/grafana-image-tags:$${TAG}-amd64
2721-
\ grafana/grafana-image-tags:$${TAG}-arm64 grafana/grafana-image-tags:$${TAG}-armv7\n\n
2722-
\ $debug docker manifest create grafana/grafana:${TAG}-ubuntu grafana/grafana-image-tags:$${TAG}-ubuntu-amd64
2723-
\ grafana/grafana-image-tags:$${TAG}-ubuntu-arm64 grafana/grafana-image-tags:$${TAG}-ubuntu-armv7\n\n
2724-
\ # Push the grafana manifests\n $debug docker manifest push grafana/grafana:$${TAG}\n
2725-
\ $debug docker manifest push grafana/grafana:$${TAG}-ubuntu\n\n # if LATEST
2726-
is set, then also create & push latest\n if [[ -n $${LATEST} ]]; then\n $debug
2727-
docker manifest create grafana/grafana:latest grafana/grafana-image-tags:$${TAG}-amd64
2728-
\ grafana/grafana-image-tags:$${TAG}-arm64 grafana/grafana-image-tags:$${TAG}-armv7\n
2729-
\ $debug docker manifest create grafana/grafana:latest-ubuntu grafana/grafana-image-tags:$${TAG}-ubuntu-amd64
2730-
\ grafana/grafana-image-tags:$${TAG}-ubuntu-arm64 grafana/grafana-image-tags:$${TAG}-ubuntu-armv7\n\n
2731-
\ $debug docker manifest push grafana/grafana:latest\n $debug docker
2732-
manifest push grafana/grafana:latest-ubuntu\n\n fi\n "
2727+
- apk add bash
2728+
- |2-
2729+
2730+
bash -c '
2731+
debug=
2732+
if [[ -n $${DRY_RUN} ]]; then debug=echo; fi
2733+
docker login -u $${DOCKER_USER} -p $${DOCKER_PASSWORD}
2734+
2735+
# Push the grafana-image-tags images
2736+
$$debug docker push grafana/grafana-image-tags:$${TAG}-amd64
2737+
$$debug docker push grafana/grafana-image-tags:$${TAG}-arm64
2738+
$$debug docker push grafana/grafana-image-tags:$${TAG}-armv7
2739+
$$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-amd64
2740+
$$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-arm64
2741+
$$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-armv7
2742+
2743+
# Create the grafana manifests
2744+
$$debug docker manifest create grafana/grafana:${TAG} grafana/grafana-image-tags:$${TAG}-amd64 grafana/grafana-image-tags:$${TAG}-arm64 grafana/grafana-image-tags:$${TAG}-armv7
2745+
2746+
$$debug docker manifest create grafana/grafana:${TAG}-ubuntu grafana/grafana-image-tags:$${TAG}-ubuntu-amd64 grafana/grafana-image-tags:$${TAG}-ubuntu-arm64 grafana/grafana-image-tags:$${TAG}-ubuntu-armv7
2747+
2748+
# Push the grafana manifests
2749+
$$debug docker manifest push grafana/grafana:$${TAG}
2750+
$$debug docker manifest push grafana/grafana:$${TAG}-ubuntu
2751+
2752+
# if LATEST is set, then also create & push latest
2753+
if [[ -n $${LATEST} ]]; then
2754+
$$debug docker manifest create grafana/grafana:latest grafana/grafana-image-tags:$${TAG}-amd64 grafana/grafana-image-tags:$${TAG}-arm64 grafana/grafana-image-tags:$${TAG}-armv7
2755+
$$debug docker manifest create grafana/grafana:latest-ubuntu grafana/grafana-image-tags:$${TAG}-ubuntu-amd64 grafana/grafana-image-tags:$${TAG}-ubuntu-arm64 grafana/grafana-image-tags:$${TAG}-ubuntu-armv7
2756+
2757+
$$debug docker manifest push grafana/grafana:latest
2758+
$$debug docker manifest push grafana/grafana:latest-ubuntu
2759+
2760+
fi'
27332761
depends_on:
27342762
- fetch-images
27352763
environment:
@@ -5244,6 +5272,6 @@ kind: secret
52445272
name: gcr_credentials
52455273
---
52465274
kind: signature
5247-
hmac: b8e339ef911101b6508b4ebfe0acd98491475bc6b8699ad3fba5399d01f8e272
5275+
hmac: 71bca116e25bc9c212d16cd7516a8002dbf5d97aadcc1b2e0649a08b9a5bd4b0
52485276

52495277
...

‎scripts/drone/pipelines/publish_images.star‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,49 @@ def publish_image_public_step():
3030
A drone step which publishes Docker images for a public release.
3131
"""
3232
command = """
33+
bash -c '
3334
debug=
3435
if [[ -n $${DRY_RUN} ]]; then debug=echo; fi
3536
docker login -u $${DOCKER_USER} -p $${DOCKER_PASSWORD}
3637
3738
# Push the grafana-image-tags images
38-
$debug docker push grafana/grafana-image-tags:$${TAG}-amd64
39-
$debug docker push grafana/grafana-image-tags:$${TAG}-arm64
40-
$debug docker push grafana/grafana-image-tags:$${TAG}-armv7
41-
$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-amd64
42-
$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-arm64
43-
$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-armv7
39+
$$debug docker push grafana/grafana-image-tags:$${TAG}-amd64
40+
$$debug docker push grafana/grafana-image-tags:$${TAG}-arm64
41+
$$debug docker push grafana/grafana-image-tags:$${TAG}-armv7
42+
$$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-amd64
43+
$$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-arm64
44+
$$debug docker push grafana/grafana-image-tags:$${TAG}-ubuntu-armv7
4445
4546
# Create the grafana manifests
46-
$debug docker manifest create grafana/grafana:${TAG} \
47+
$$debug docker manifest create grafana/grafana:${TAG} \
4748
grafana/grafana-image-tags:$${TAG}-amd64 \
4849
grafana/grafana-image-tags:$${TAG}-arm64 \
4950
grafana/grafana-image-tags:$${TAG}-armv7
5051
51-
$debug docker manifest create grafana/grafana:${TAG}-ubuntu \
52+
$$debug docker manifest create grafana/grafana:${TAG}-ubuntu \
5253
grafana/grafana-image-tags:$${TAG}-ubuntu-amd64 \
5354
grafana/grafana-image-tags:$${TAG}-ubuntu-arm64 \
5455
grafana/grafana-image-tags:$${TAG}-ubuntu-armv7
5556
5657
# Push the grafana manifests
57-
$debug docker manifest push grafana/grafana:$${TAG}
58-
$debug docker manifest push grafana/grafana:$${TAG}-ubuntu
58+
$$debug docker manifest push grafana/grafana:$${TAG}
59+
$$debug docker manifest push grafana/grafana:$${TAG}-ubuntu
5960
6061
# if LATEST is set, then also create & push latest
6162
if [[ -n $${LATEST} ]]; then
62-
$debug docker manifest create grafana/grafana:latest \
63+
$$debug docker manifest create grafana/grafana:latest \
6364
grafana/grafana-image-tags:$${TAG}-amd64 \
6465
grafana/grafana-image-tags:$${TAG}-arm64 \
6566
grafana/grafana-image-tags:$${TAG}-armv7
66-
$debug docker manifest create grafana/grafana:latest-ubuntu \
67+
$$debug docker manifest create grafana/grafana:latest-ubuntu \
6768
grafana/grafana-image-tags:$${TAG}-ubuntu-amd64 \
6869
grafana/grafana-image-tags:$${TAG}-ubuntu-arm64 \
6970
grafana/grafana-image-tags:$${TAG}-ubuntu-armv7
7071
71-
$debug docker manifest push grafana/grafana:latest
72-
$debug docker manifest push grafana/grafana:latest-ubuntu
72+
$$debug docker manifest push grafana/grafana:latest
73+
$$debug docker manifest push grafana/grafana:latest-ubuntu
7374
74-
fi
75-
"""
75+
fi'"""
7676
return {
7777
"environment": {
7878
"DOCKER_USER": from_secret("docker_username"),
@@ -81,7 +81,10 @@ def publish_image_public_step():
8181
"name": "publish-images-grafana",
8282
"image": images["docker"],
8383
"depends_on": ["fetch-images"],
84-
"commands": [command],
84+
"commands": [
85+
"apk add bash",
86+
command,
87+
],
8588
"volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
8689
}
8790

0 commit comments

Comments
 (0)