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.

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

Add docker #1581

Merged
merged 1 commit into from
Jan 27, 2014
Merged

Add docker #1581

merged 1 commit into from
Jan 27, 2014

Conversation

offlinehacker
Copy link
Contributor

No description provided.

@offlinehacker
Copy link
Contributor Author

meh wrong rebase, just a second

@offlinehacker
Copy link
Contributor Author

Also nixos module should be made, docker plays nicely with systemd. Report any problems you have, i just made a basic smoke test.

@@ -6369,6 +6369,7 @@ let

apparmor = callPackage ../os-specific/linux/apparmor {
inherit (perlPackages) LocaleGettext TermReadKey RpcXML;
bison = bison2;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this related to docker change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker needs lxc, and lxc does not build without this change, because apparmor does not build with new bison(just look in hydra, failing).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quoting Jaka Hudoklin (2014-01-25 09:08:05)

In pkgs/top-level/all-packages.nix:

@@ -6369,6 +6369,7 @@ let

apparmor = callPackage ../os-specific/linux/apparmor {
inherit (perlPackages) LocaleGettext TermReadKey RpcXML;

  • bison = bison2;

Docker needs lxc, and lxc does not build without this change.

k, didn't new this. i though it slipped into this pull request.

@garbas
Copy link
Member

garbas commented Jan 25, 2014

+1 ... awesome can't wait to try it ;)

@garbas
Copy link
Member

garbas commented Jan 25, 2014

i sent you xtruder/pull/1 to fix above issue when running docker as a user i get

% docker pull ubuntu                                                                                                                                             !20050
2014/01/25 18:43:43 dial unix /var/run/docker.sock: no such file or directory

is this something we need to fix in package? or we need to create nixos service?

@offlinehacker
Copy link
Contributor Author

We need nixos service. You first need to start docker daemon with "sudo docker -d" and then you can run docker. I haven't made nixos service yet.

@offlinehacker
Copy link
Contributor Author

Thx for the patch :)

@offlinehacker
Copy link
Contributor Author

Ok i rebased it, i also added zsh and bash autocompletion functions and systemd service, so you can easily make nixos module :)

garbas added a commit that referenced this pull request Jan 27, 2014
@garbas garbas merged commit e6e2459 into NixOS:master Jan 27, 2014
@zefhemel zefhemel mentioned this pull request Jan 28, 2014
@zefhemel
Copy link
Contributor

Awesome!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants