Remove base and arch args (#58209)

This commit is contained in:
Dimitris Sotirakis 2022-11-04 13:21:18 +02:00 committed by GitHub
parent 9ff2765bb9
commit 9c1c10ab9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 14 deletions

View File

@ -1447,8 +1447,7 @@ steps:
- name: docker
path: /var/run/docker.sock
- commands:
- ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana --base
alpine --base ubuntu --arch amd64 --arch arm64 --arch armv7
- ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana
depends_on:
- build-docker-images
- build-docker-images-ubuntu
@ -1468,8 +1467,7 @@ steps:
repo:
- grafana/grafana
- commands:
- ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana-oss --base
alpine --base ubuntu --arch amd64 --arch arm64 --arch armv7
- ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana-oss
depends_on:
- build-docker-images
- build-docker-images-ubuntu
@ -3319,8 +3317,8 @@ steps:
- name: docker
path: /var/run/docker.sock
- commands:
- ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana --base
alpine --base ubuntu --arch amd64 --arch arm64 --arch armv7 --version-tag ${TAG}
- ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana --version-tag
${TAG}
depends_on:
- fetch-images-oss
environment:
@ -3336,8 +3334,8 @@ steps:
- name: docker
path: /var/run/docker.sock
- commands:
- ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana-oss --base
alpine --base ubuntu --arch amd64 --arch arm64 --arch armv7 --version-tag ${TAG}
- ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana-oss --version-tag
${TAG}
depends_on:
- fetch-images-oss
environment:
@ -3408,8 +3406,7 @@ steps:
path: /var/run/docker.sock
- commands:
- ./bin/grabpl artifacts docker publish --dockerhub-repo grafana/grafana-enterprise
--base alpine --base ubuntu --arch amd64 --arch arm64 --arch armv7 --version-tag
${TAG}
--version-tag ${TAG}
depends_on:
- fetch-images-enterprise
environment:
@ -3480,8 +3477,7 @@ steps:
path: /var/run/docker.sock
- commands:
- ./bin/grabpl artifacts docker publish --security --dockerhub-repo grafana/grafana-enterprise
--base alpine --base ubuntu --arch amd64 --arch arm64 --arch armv7 --version-tag
${TAG}
--version-tag ${TAG}
depends_on:
- fetch-images-enterprise
environment:
@ -5450,6 +5446,6 @@ kind: secret
name: packages_secret_access_key
---
kind: signature
hmac: 284ccba3c82e516df5db917eec0afde057a622394002b3a311276fe528b7a86c
hmac: c05242e46e10d9e2af78c038a72879351ab553787b2732c8afaf32c706e45096
...

View File

@ -815,7 +815,7 @@ def publish_images_step(edition, ver_mode, mode, docker_repo, trigger=None):
else:
mode = ''
cmd = './bin/grabpl artifacts docker publish {}--dockerhub-repo {} --base alpine --base ubuntu --arch amd64 --arch arm64 --arch armv7'.format(
cmd = './bin/grabpl artifacts docker publish {}--dockerhub-repo {}'.format(
mode, docker_repo)
if ver_mode == 'release':