-
Notifications
You must be signed in to change notification settings - Fork 18.6k
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
use apt-ftparchive and reprepro to enable apt-pinning; #16001
Conversation
yayyyy |
e227533
to
82e69ae
Compare
also new feature:
|
@@ -35,6 +35,51 @@ if [[ ! -f "$APTDIR/conf/distributions" ]]; then | |||
done > "$APTDIR/conf/distributions" | |||
fi | |||
|
|||
# create/update distributions file | |||
if [[ ! -f "$APTDIR/conf/apt-ftparchive.conf" ]]; then |
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.
Just going to nitpick to see if @tianon corrects me:)
I think this only needs a single bracket
Pretty! |
we could probably remove reprepro all together and just use apt-ftparchive but this is good for now,, then we can have maybe followup PR |
cat <<-EOF | ||
Tree "dists/${suite}" { | ||
Sections "main testing experimental"; | ||
Architectures "i386 amd64"; |
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.
Do you think we should put these fields into an array at the top of the file since they're used multiple places? Then we could use for arch in "${arches[@]}"; do ...
for iterating and ${arches[*]}
for printing space-separated.
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.
Maybe the sections also?
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.
I guess we don't use the sections explicitly in nearly as many places as the arches.
82e69ae
to
2467b65
Compare
|
||
|
||
# run the apt-ftparchive commands so we can have pinning | ||
apt-ftparchive generate $APTDIR/conf/apt-ftparchive.conf |
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.
moar quotes 😄
Can't wait to check this out! I'll pull this down in a sec later today :D
|
Yeah, it definitely feels a little bit like we're abusing The logic seems sane enough to me, although I think @paultag will probably have more direct feedback he'll be able to give. ❤️ |
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2467b65
to
12a71c8
Compare
updated! and yayyyy! yeah it feel like we are just using reprepro to put On Wed, Sep 2, 2015 at 9:29 AM, Tianon Gravi notifications@github.com
|
also yeah I wanted something without having to add another tool or On Wed, Sep 2, 2015 at 9:35 AM, Jessie Frazelle jess@docker.com wrote:
|
This would make my life a lot easier - thanks for doing this @jfrazelle, can't wait to see it go live. |
This seems like a totally sensible changeset -- Seems like a great set of changes. Nice! 🎊 👍 here. |
LGTM. Merging and cherry picking into #15809 |
use apt-ftparchive and reprepro to enable apt-pinning;
After docker 1.7.0 we (Remind) have seen this issue pop up: moby/moby#13914 Now that this is closed: moby/moby#16001 We can use the new docker-engine packages, but with an old version. I'm moving the empire_ami back to docker 1.7.0 till 13914 above is fixed. As well, this should fix ECS stats - we just needed a bunch of volumes, per: aws/amazon-ecs-agent#174 Doing this internally @ Remind fixed this.
fix #13191
ping @tianon pinng @paultag
this is the hackiest thing of my life but it works
I cloned our repo to new.dockerproject.org if you want to test before we make live ;)