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

update dockerfile to use correct package for os/arch #11883

Merged
merged 1 commit into from
Jul 29, 2021

Conversation

nkierpiec
Copy link

@nkierpiec nkierpiec commented Jul 29, 2021

Update Dockerfile to pull in the correct version of chef when building for arm

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Chore (non-breaking change that does not add functionality or fix an issue)

Checklist:

  • I have read the CONTRIBUTING document.
  • I have run the pre-merge tests locally and they pass.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commits have been signed-off for the Developer Certificate of Origin.

Signed-off-by: Nathaniel Kierpiec <nkierpiec@chef.io>
@nkierpiec nkierpiec requested review from a team as code owners July 29, 2021 19:22
@tas50 tas50 merged commit f8a5028 into master Jul 29, 2021
@tas50 tas50 deleted the nkierpiec/update-dockerfile-correct-arch branch July 29, 2021 19:36
@@ -2,13 +2,24 @@
set -eu -o pipefail

arch=$1

if [[ $arch == "arm64" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

Style. Fill free to skip.

I prefer not doing if/else in this case but to set a default and then override:

dockerfile_pkg_version="6"
dockerfile_arch="x86_64"
if [[ $arch == "arm64" ]]; then
    dockerfile_pkg_version="7"
    dockerfile_arch="aarch64"
fi

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants