Skip to content

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

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.

Sign up for GitHub

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

Merged
kodiakhq merged 9 commits into from
Dec 20, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41b1df3
Avoid container build by adding /.mariner-toolkit-ignore-dockerenv
damonbarry Dec 18, 2024
5192970
Lock dependencies when installing cross for edgelet CI
damonbarry Dec 19, 2024
a89e8e1
Update identity service references to get dockerenv fix
damonbarry Dec 19, 2024
4fb1d0c
Invoke lxd commands as member of lxd group
damonbarry Dec 19, 2024
02c9a44
Fix cargo install command
damonbarry Dec 19, 2024
8e1206c
Refer to lxd by its full path
damonbarry Dec 19, 2024
ba16df6
Add commands for debugging
damonbarry Dec 20, 2024
ee8119e
Don't add user to lxd (already added) and refresh snaps
damonbarry Dec 20, 2024
6a94e3c
Remove snap debugging commands
damonbarry Dec 20, 2024
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
4 changes: 2 additions & 2 deletions builds/checkin/edgelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
displayName: Set Version
- bash: scripts/linux/generic-rust/install.sh --project-root "edgelet"
displayName: Install Rust
- script: "cargo install cross --version ^0.2"
- script: "cargo install cross --version ^0.2 --locked"
displayName: "Install cross"
- script: "cross build --target armv7-unknown-linux-gnueabihf"
displayName: armv7-unknown-linux-gnueabihf build
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
displayName: Set Version
- bash: scripts/linux/generic-rust/install.sh --project-root "edgelet"
displayName: Install Rust
- script: "cargo install cross --version ^0.2"
- script: "cargo install cross --version ^0.2 --locked"
displayName: "Install cross"
- script: "cross build --target aarch64-unknown-linux-gnu"
displayName: aarch64-unknown-linux-gnu build
Expand Down
3 changes: 3 additions & 0 deletions builds/misc/templates/build-packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ stages:
- ImageOverride -equals $(image)
steps:
- script: |
#!/bin/bash
set -xeuo pipefail
sudo snap refresh
sudo snap install snapcraft --classic
lxd init --minimal
SNAPCRAFT_BUILD_INFO=1 snapcraft --use-lxd
Expand Down
52 changes: 26 additions & 26 deletions edgelet/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions edgelet/build/linux/package-mariner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ apt-get install -y \

rm -f /usr/bin/go
ln -vs /usr/lib/go-1.21/bin/go /usr/bin/go
if [ -f /.dockerenv ]; then
mv /.dockerenv /.dockerenv.old
fi
touch /.mariner-toolkit-ignore-dockerenv

# Download Mariner repo and build toolkit
mkdir -p ${MARINER_BUILD_ROOT}
Expand Down