Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added missed binaries required to run ./tools/image-tag script #8640

Merged
merged 2 commits into from
Feb 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .drone/drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,8 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {
image: 'alpine',
depends_on: ['check-version-is-latest'],
commands: [
'apk add --no-cache bash git',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of interest, can we not just use ash instead?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean sh instead of bash?

+ RELEASE_TAG=$(./tools/image-tag)
env: can't execute 'bash': No such file or directory

I guess our image-tag requires bash looks like.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I mean ash which is the default shell of Alpine

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have #!/usr/bin/env bash in the header of image-tag, which is probably unnecessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have #!/usr/bin/env bash in the header of image-tag, which is probably unnecessary.

yep, nothing bash specific is used in the script )) so I believe we can remove the header from the script or make it flexible to be able to run in any terminal...

anyway, not only bash was missed, git is also required, so let's merge this PR and update ./tools/image-tag script when we have time and need ))

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM 👍

'git fetch origin --tags',
'RELEASE_TAG=$(./tools/image-tag)',
'echo $PLUGIN_CONFIG_TEMPLATE > %s' % configFileName,
// replace placeholders with RELEASE TAG
Expand Down
4 changes: 3 additions & 1 deletion .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,8 @@ steps:
event:
- tag
- commands:
- apk add --no-cache bash git
- git fetch origin --tags
- RELEASE_TAG=$(./tools/image-tag)
- echo $PLUGIN_CONFIG_TEMPLATE > updater-config.json
- sed -i -E "s/\{\{release\}\}/$RELEASE_TAG/g" updater-config.json
Expand Down Expand Up @@ -1725,6 +1727,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: eb49b720f2c0552e8cd002c532a774a48b03372b8cbac769aacd80d4175bb700
hmac: ae19447e0f2e91746c5b4e6a3dc469a08a63c44045f4b995a6980d0e401e071f

...