Backport toolkit container detection using systemd-detect-virt#11135
Merged
dmcilvaney merged 3 commits intomicrosoft:mainfrom Nov 26, 2024
Merged
Conversation
7f1f225 to
837efd7
Compare
837efd7 to
8fab474
Compare
jslobodzian
approved these changes
Nov 25, 2024
jslobodzian
approved these changes
Nov 25, 2024
This was referenced Dec 18, 2024
Merged
kodiakhq Bot
pushed a commit
to Azure/iot-identity-service
that referenced
this pull request
Dec 19, 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.
kodiakhq Bot
pushed a commit
to Azure/iotedge
that referenced
this pull request
Dec 20, 2024
…7409) 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 file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
*-staticsubpackages, etc.) have had theirReleasetag incremented../cgmanifest.json,./toolkit/scripts/toolchain/cgmanifest.json,.github/workflows/cgmanifest.json)./LICENSES-AND-NOTICES/SPECS/data/licenses.json,./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md,./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)*.signatures.jsonfilessudo make go-tidy-allandsudo make go-test-coveragepassSummary
Backport of #11039. Removed the calls to
logger.PrintMessageBox()and replaced withlogger.Log.Warn().Previous PR description follows:
Change Log
systemd-detect-virtover/.dockerenvfor container detectionDoes this affect the toolchain?
NO
Associated issues
Links to CVEs
Test Methodology