Prevent APT using source lists from /etc/apt/sources.list.d/ #46
Conversation
This file contains 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
|
The test failures on Travis are pre-existing (ie on I've tested this buildpack branch against a test app, and it successfully installed the packages that failed in the #45 example: |
joshwlewis
reviewed
Jun 10, 2019
bin/compile
Outdated
| @@ -54,7 +54,8 @@ else | |||
| fi | |||
|
|
|||
| APT_OPTIONS="-o debug::nolocking=true -o dir::cache=$APT_CACHE_DIR -o dir::state=$APT_STATE_DIR" | |||
| APT_OPTIONS="$APT_OPTIONS -o dir::etc::sourcelist=$APT_SOURCES" | |||
| # Override the use of /etc/apt/sources.list (sourcelist) and /etc/apt/sources.list.d/* (sourceparts). | |||
| APT_OPTIONS="$APT_OPTIONS -o dir::etc::sourcelist=$APT_SOURCES -o dir::etc::sourceparts=-'" | |||
There was a problem hiding this comment.
Why have -' as the value here? I would have expected this to be an empty or non-existent directory.
There was a problem hiding this comment.
Oh sorry the trailing ' isn't meant to be there. The - is since that's what several SO / GitHub code references use. I tried to find a more authoritative guide as to what the supported path scheme was, however the docs are pretty lacking.
I'd be open to trying an empty string here and seeing whether that works too.
There was a problem hiding this comment.
Trying with the empty string results in apt-get update returning the man page (which doesn't cause the buildpack to fail early, due to #47).
I've switched it back to - (minus the ' typo).
There was a problem hiding this comment.
So I found a reference to /dev/null in the APT source, here:
https://salsa.debian.org/apt-team/apt/blob/f15e090301e0744471d0fbf86ea0d494f6c08215/apt-pkg/sourcelist.cc#L313
...so I've switched it one last time to use that instead now 😆
(And re-tested again to ensure that works)
edmorley
force-pushed
the
edmorley-apt-sourceparts
branch
from
4b0e477
to
6910e8c
Compare
Previously the buildpack only passed `-o dir::etc::sourcelist` to APT, which meant that APT still used the default `sourceparts` location of `/etc/apt/sources.list.d/`. This meant on cedar-14 this buildpack would use esm.ubuntu.com as an APT source (as of heroku/base-images/pull/140), which results in errors if the requested packages happened to have ESM-only updates available (since the ESM repository requires credentials since it's a paid Ubuntu offering). Fixes #45 / W-6224944.
edmorley
force-pushed
the
edmorley-apt-sourceparts
branch
from
6910e8c
to
0beae64
Compare
Since whilst `-` appears to work, `/dev/null` is what is referenced here: https://salsa.debian.org/apt-team/apt/blob/f15e090301e0744471d0fbf86ea0d494f6c08215/apt-pkg/sourcelist.cc#L313
beanieboi
approved these changes
Jun 11, 2019
|
And published: |
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.
Previously the buildpack only passed
-o dir::etc::sourcelistto APT, which meant that APT still used the defaultsourcepartslocation of/etc/apt/sources.list.d/.This meant on cedar-14 this buildpack would use esm.ubuntu.com as an APT source (as of heroku/base-images/pull/140), which results in errors if the requested packages happened to have ESM-only updates available (since the ESM repository requires credentials since it's a paid Ubuntu offering).
Fixes #45 / W-6224944.