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

fix(cd): use correct sha for PR based docker build #12115

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Conversation

fffonion
Copy link
Contributor

@fffonion fffonion commented Nov 29, 2023

KAG-3251

Summary

use github.event.pull_request.head.sha instead of github.sha on a PR, as github.sha on PR is the merged commit (temporary commit).

also correctly set the KONG_VERSION env var.

Checklist

  • The Pull Request has tests
  • [na] A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • [na] There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

@github-actions github-actions bot added the chore Not part of the core functionality of kong, but still needed label Nov 29, 2023
@fffonion
Copy link
Contributor Author

docker inspect kong/kong:b32b41d93f1e4001ee16006ddca8561021aeedd6-ubuntu|jq .[].Config.Labels
{
  "maintainer": "Kong Docker Maintainers <[email protected]> (@team-gateway-bot)",
  "org.opencontainers.image.created": "2023-11-29T07:43:19.673Z",
  "org.opencontainers.image.description": "🦍 The Cloud-Native API Gateway",
  "org.opencontainers.image.licenses": "Apache-2.0",
  "org.opencontainers.image.ref.name": "ubuntu",
  "org.opencontainers.image.revision": "b32b41d93f1e4001ee16006ddca8561021aeedd6",
  "org.opencontainers.image.source": "https://github.com/Kong/kong",
  "org.opencontainers.image.title": "kong",
  "org.opencontainers.image.url": "https://github.com/Kong/kong",
  "org.opencontainers.image.version": "b32b41d93f1e4001ee16006ddca8561021aeedd6-ubuntu"
}

@windmgc windmgc merged commit 7e5a113 into master Nov 29, 2023
13 checks passed
@windmgc windmgc deleted the fix-pr-commit-sha branch November 29, 2023 08:24
team-gateway-bot pushed a commit that referenced this pull request Nov 29, 2023
use github.event.pull_request.head.sha instead of github.sha on a PR, as github.sha on PR is the merged commit (temporary commit).

also correctly set the KONG_VERSION env var.

* fix(cd): use correct sha for PR based docker build

* fix(cd): set correct KONG_VERSION in docker image

KAG-3251

(cherry picked from commit 7e5a113)
bungle pushed a commit that referenced this pull request Nov 29, 2023
use github.event.pull_request.head.sha instead of github.sha on a PR, as github.sha on PR is the merged commit (temporary commit).

also correctly set the KONG_VERSION env var.

* fix(cd): use correct sha for PR based docker build

* fix(cd): set correct KONG_VERSION in docker image

KAG-3251

(cherry picked from commit 7e5a113)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Not part of the core functionality of kong, but still needed size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants