Commit graph

8 commits

Author SHA1 Message Date
Robin Gloster
00dc83bfa0
dockerTools: fix hash to accomodate the pullImage revert
(cherry picked from commit 20677fca59)
2017-09-28 14:12:10 +02:00
Robin Gloster
289358e277
Revert "dockerTools.pullImage: use skopeo to pull the image"
This reverts commit 01174c5f4d.

See https://github.com/NixOS/nixpkgs/pull/29302#issuecomment-332809092
for more information. This broke image format compatibility and
therefore amongst others mesos.

(cherry picked from commit 5c6dc717a6)
2017-09-28 14:12:10 +02:00
Antoine Eiche
572a0e1b12
dockerTools.examples.nix: set NIX_PAGER=cat environment variable
(cherry picked from commit ff4d7f0fd2)
2017-09-26 00:25:24 +02:00
Antoine Eiche
1231f40731
dockerTools.buildImageWithNixDb: populate the Nix Db of the image Nix store
Currently, the contents closure is copied to the layer but there is no
nix database initialization. If pkgs.nix is added in the contents,
nix-store doesn't work because there is no nix database.

From the contents of the layer, this commit generates and loads the
database in the nix store of the container. This only works if there
is no parent layer that already have a nix store (to support several
nix layers, we would have to merge nix databases of parent layers).

We also add an example to play with the nix store inside the
container. Note it seems `more` is a missing dependency of the nix
package!

(cherry picked from commit df589a438e)
2017-09-26 00:25:24 +02:00
Antoine Eiche
dc4178e15a
dockerTools.pullImage: use skopeo to pull the image
Before this patch, a VM was used to spawn docker that pulled the
VM. Now, the tool Skopeo does this job well so we can simplify our
dockerTools since we doesn't need Docker anymore:)

This also fixe the regression described in
https://github.com/NixOS/nixpkgs/issues/29271 : cntlm proxy doesn't
work in 17.09 while it worked in 17.03.

Note Skopeo doesn't produce the same output than docker pull so, we
have to update sha.

(cherry picked from commit 01174c5f4d)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-09-17 09:27:04 +02:00
Matej Cotman
8d3cb0af9e docker tools: fix pull image function 2017-05-26 18:48:16 +02:00
Allen Nelson
940aafcbcc use rsync, comment out pulls 2016-10-03 15:12:29 -05:00
Allen Nelson
b9007c8d83 add examples file 2016-10-03 12:07:33 -05:00