Skip to content
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

Jump to bottom

docker: 17.03.0 -> 17.03.1 #24619

Merged
merged 1 commit into from Apr 4, 2017
Merged

docker: 17.03.0 -> 17.03.1 #24619

merged 1 commit into from Apr 4, 2017

Conversation

NeQuissimus
Copy link
Member

Motivation for this change

Updated to latest version.

The Docker folks are about to release their first "edge" version, which will mean for us that there will be two Docker versions supported.
This lays the groundwork. Since 17.03 will be around for a while, I created a new docker-stable package alias that points at it right now.
Adding 17.04 will be trivial (should be out this week)

Docker releases

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@NeQuissimus, thanks for your PR! By analyzing the history of the files in this pull request, we identified @offlinehacker, @vdemeester and @benley to be potential reviewers.

@vdemeester
Copy link
Member

vdemeester commented Apr 4, 2017 •
edited

@NeQuissimus should it be docker and docker-edge instead ? (so you choose to get the edge version, by default you would follow stable)

@NeQuissimus
Copy link
Member Author

NeQuissimus commented Apr 4, 2017 •
edited

@vdemeester Yeah, that is fine with me. I was going to introduce both, docker-stable and docker-edge, and then have docker always point at stable but that is just redundant, I suppose...

Edit: Updated

@vdemeester
Copy link
Member

@NeQuissimus hum but in your PR there is just docker now (no stable/edge) ? 17.04 is about to ship (RC2 is on) so we'll update this soon, but as it is an edge, I think it should be "another" name for it. Might be a bit redondant but I don't see another way to "mimic" the channel behaviour.

17.04 will be edge, 17.05 will be edge, 17.06 will be stable (and edge user should get it even though it's not an edge).. On other OSes (like debian) it works because it's using multiple repositories but.. for NixOS I don't think we can do that.

@NeQuissimus
Copy link
Member Author

NeQuissimus commented Apr 4, 2017 •
edited

@vdemeester yeah yeah, so when 17.04 comes out, we add docker-edge = docker_17_04 to all-packages. I just can't add that right now because there is no 17.04 release.

So if you install docker-edge, you always get latest. You install docker, you get whatever is the current stable.

@vdemeester
Copy link
Member

@NeQuissimus sounds good to me then 👼 👍
We could open a WIP PR for 17.04 (I can do it if you want) quickly even though it's still RC and remove WIP when it's GA 😛

Anyway, LGTM 👍 🦁 on this !

@NeQuissimus NeQuissimus merged commit 67142c5 into NixOS:master Apr 4, 2017
@NeQuissimus NeQuissimus deleted the docker_17_03_1 branch April 4, 2017 18:45
@NeQuissimus NeQuissimus mentioned this pull request Apr 4, 2017
Merged
7 tasks
@NeQuissimus NeQuissimus mentioned this pull request May 7, 2017
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@NeQuissimus @mention-bot @vdemeester