Skip to content

Avoid container build by adding /.mariner-toolkit-ignore-dockerenv#7409

Merged
kodiakhq[bot] merged 9 commits intoAzure:mainfrom
damonbarry:fix-azurelinux-builds
Dec 20, 2024
Merged

Avoid container build by adding /.mariner-toolkit-ignore-dockerenv#7409
kodiakhq[bot] merged 9 commits intoAzure:mainfrom
damonbarry:fix-azurelinux-builds

Conversation

@damonbarry
Copy link
Copy Markdown
Member

@damonbarry damonbarry commented Dec 18, 2024

Our Azure Linux builds started failing in the past week or so because Azure Linux recently made a change to how they detect container builds (see microsoft/azurelinux#11135), so the trick we employed to force a regular build (even though we're building in a container) stopped working. This change removes the trick and takes the recommended approach of adding /.mariner-toolkit-ignore-dockerenv to the container.

Other changes were also needed to resolve problems that came up while testing this PR:

  • Snap builds began failing, seemingly due to a bad version combination of snapcraft and lxd. I updated the build task to do snap refresh before building.
  • Our CI build for Azure Linux on arm64 uses the build scripts from the iot-identity-service repo, so I updated this repo's references to the iot-identity-service repo to fix the container build detection problem there.
  • A recent update to a dependency of cross requires a newer rustc version and was causing the edgelet CI runs to fail in this PR because our rustc version is fixed at 1.73, I added the '--locked' flag to the cargo command that installs cross in the edgelet CI build.

To test, I confirmed that the CI Build passes with these changes.

Azure IoT Edge PR checklist:

This checklist is used to make sure that common guidelines for a pull request are followed.

General Guidelines and Best Practices

  • I have read the contribution guidelines.
  • Title of the pull request is clear and informative.
  • Description of the pull request includes a concise summary of the enhancement or bug fix.

Testing Guidelines

  • Pull request includes test coverage for the included changes.
  • Description of the pull request includes
    • concise summary of tests added/modified
    • local testing done.

@kodiakhq kodiakhq Bot merged commit 569235e into Azure:main Dec 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants