-
Notifications
You must be signed in to change notification settings - Fork 2k
Use Network Isolation-compatible package feeds #7297
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
Open
lbussell
wants to merge
6
commits into
dotnet:nightly
Choose a base branch
from
lbussell:netiso-package-feeds
base: nightly
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
70f61d1
Use Network Isolation-compatible APT feeds
lbussell e3503d4
Redirect Debian security feeds during builds
lbussell 2324975
Enable all CFSClean policies for unofficial validation
lbussell 57aa040
Use Azure Ubuntu mirror for arm64 builds
lbussell df27826
Use patched Chisel for isolated builds
lbussell a5381c0
Move isolated APT mirrors to manifest
lbussell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,15 +7,14 @@ | |
| set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^ | ||
| set osVersionNumber to split(OS_ARCH_HYPHENATED, "-")[1] ^ | ||
|
|
||
| set chiselUrl to VARIABLES[cat("chisel|", dotnetVersion, "|", ARCH_SHORT, "|url")] ^ | ||
| set chiselFileName to "chisel.tar.gz" ^ | ||
| set shaFunction to "384" ^ | ||
| set chiselSha to VARIABLES[cat("chisel|", dotnetVersion, "|", ARCH_SHORT, "|sha", shaFunction)] ^ | ||
| set chiselCommit to VARIABLES[cat("chisel|", dotnetVersion, "|commit")] ^ | ||
| set ubuntuAptFeed to VARIABLES["apt-mirror|ubuntu|x64|from"] ^ | ||
| set ubuntuAptMirror to VARIABLES["apt-mirror|ubuntu|x64|to"] ^ | ||
| set rocksToolboxBaseUrl to VARIABLES[cat("rocks-toolbox|", dotnetVersion, "|url")] ^ | ||
| set rocksToolboxRef to VARIABLES[cat("rocks-toolbox|", dotnetVersion, "|version")] ^ | ||
| set rocksToolboxUrl to cat(rocksToolboxBaseUrl, "/", rocksToolboxRef, "/chisel-wrapper") ^ | ||
|
|
||
| set installerImageTag to cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl") ^ | ||
| set installerImageTag to VARIABLES[cat("chisel|", dotnetVersion, "|golang-image")] ^ | ||
|
|
||
| set opensslPkg to when(match(osVersionBase, "jammy"), "libssl3", "libssl3t64") ^ | ||
|
|
||
|
|
@@ -62,24 +61,21 @@ | |
|
|
||
| }}FROM {{installerImageTag}} AS chisel | ||
|
|
||
| RUN apt-get update && apt-get install -y file | ||
| RUN apt-get update \ | ||
| && apt-get install -y --no-install-recommends file \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
Comment on lines
+64
to
+66
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Presumably this will be hitting deb.debian.org, not the Azure URL. |
||
|
|
||
| RUN git init /src/chisel \ | ||
| && git -C /src/chisel remote add origin https://github.com/canonical/chisel.git \ | ||
| && git -C /src/chisel fetch --depth 1 origin {{chiselCommit}} \ | ||
| && git -C /src/chisel checkout --detach FETCH_HEAD \ | ||
| && sed --in-place 's|http://{{ubuntuAptFeed}}/|http://{{ubuntuAptMirror}}/|' /src/chisel/internal/archive/archive.go | ||
|
|
||
| WORKDIR /src/chisel | ||
|
|
||
| ENV CHISEL_BIN="go run ./cmd/chisel" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we also need approved package feeds for Go? This ends up downloading modules. |
||
|
|
||
| RUN {{InsertTemplate("../Dockerfile.linux.download-files", ["files": [[ | ||
| "url": chiselUrl, | ||
| "out-file": chiselFileName | ||
| ]]], " ")}} \ | ||
| && {{InsertTemplate("../Dockerfile.linux.validate-checksum", [ | ||
| "file": chiselFileName, | ||
| "sha-function": shaFunction, | ||
| "sha": chiselSha, | ||
| "sha-var-name": cat("chisel_sha", shaFunction) | ||
| ], " ")}} \ | ||
| && {{InsertTemplate("../Dockerfile.linux.extract-file", [ | ||
| "file": chiselFileName, | ||
| "dest-dir": "/usr/bin/" | ||
| ], " ")}} \ | ||
| && rm {{chiselFileName}} \ | ||
| && {{InsertTemplate("../Dockerfile.linux.download-files", ["files": [[ | ||
| "url": rocksToolboxUrl, | ||
| "out-file": "/usr/bin/chisel-wrapper" | ||
| ]]], " ")}} \ | ||
|
|
||
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
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
23 changes: 15 additions & 8 deletions
23
src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile
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
23 changes: 15 additions & 8 deletions
23
src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile
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
23 changes: 15 additions & 8 deletions
23
src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is hardcoding the architecture.