Commit graph

144 commits

Author SHA1 Message Date
Ozan Sener 78f322f2d0 dockerTools: fix build on Darwin
Fixes #110665

Introduced by #109420
2021-03-04 16:17:48 +01:00
Andreas Rammhold ed46383416 docker: allow overriding package inputs per docker package
Previously we could not override the input packages to docker at all as
that had been shadowed due to the usage of inherit in all-package.nix.

We are now mixing the "variable" variables for the build and the
dependency declarations for the package and using callPackage as if each
of the docker packages would be separate files that we evaluate.

This now enables overriding e.g. iptables for a single verison of
docker which previously was not feasible without importing the
default.nix again (and passing different arguments).

> pkgs.docker.override { iptables = pkgs.iptables-nftables-compat; }
2021-01-26 13:08:25 +01:00
volth bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Ivan Babrou aea19f284a docker: correct substitution path with buildx enabled
Starting with Docker 20.10, the client repo moved and the path changed.
2021-01-22 13:43:30 -08:00
Ivan Babrou deb0d298a2 docker: add buildx support to docker client 2021-01-21 12:52:46 -08:00
Mark Vainomaa b451286b1f
docker: 19.03.4 -> 20.10.2 (#108960)
This commit refactors the build process to handle Docker engine and
CLI split.
2021-01-13 11:33:14 +01:00
zowoq 824cfdd019 docker: disable containerd completion
not available in containerd prior to 1.4
2020-12-29 09:33:28 +10:00
Sergey Lukjanov b999879206 docker: 19.03.13 -> 19.03.14 2020-12-01 23:34:59 -08:00
Graham Christensen bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
zowoq cdf6ffdf2e docker: add passthru.tests 2020-11-23 08:43:08 +10:00
zowoq 33822cb12f docker: drop redundant removeReferencesTo 2020-11-18 08:13:34 +10:00
Milan Pässler 0dc4ced3eb docker: 19.03.12 -> 19.03.13
Added libseccomp and pkgconfig inputs to containerd, because 1.3.x requires them.
However containerd 1.2.x and 1.4.x do not.
2020-10-27 12:48:51 +01:00
Sandro Jäckel e44cc1404b docker: use upstream repo for containerd
http://github.com/docker/containerd is archived and redirects to
https://github.com/docker-archive/containerd.

To make updates easier track the upstream repo which Docker uses.
2020-10-24 00:12:06 +10:00
Tim Steinbach 9ef0ac8fe9
docker: Remove maintainer nequissimus 2020-10-08 11:00:14 -04:00
Ryan Burns 9d58eb47f2 docker_18_09: fix build
The cross-compilation patch introduced in
https://github.com/NixOS/nixpkgs/pull/92140
fixes an issue introduced in Docker CE 19.03,
and will not apply to (and is not needed for)
previous versions.
2020-09-19 20:29:26 -07:00
Linus Heckemann bba8571c39
Merge pull request #96538 from Mic92/go-references
buildGoModule/buildGoPackage: Remove go references from lib,libexec
2020-08-30 16:44:08 +02:00
Jörg Thalheim 7aa189970a
docker: simplify remove-references-to 2020-08-28 13:19:11 +01:00
Mario Rodas 7201fac2e7
docker: fix build on darwin
The directory change to `./go/src/${goPackagePath}` was only executed on
Linux.
2020-08-28 00:00:00 +00:00
betaboon 493f219f95 docker: use buildGoPackage 2020-07-03 09:21:26 +02:00
Sergey Lukjanov afc8bd6a7b docker: use git tags instead of revs 2020-06-26 14:55:52 -07:00
Sergey Lukjanov fcede31c25 docker: 19.03.11 -> 19.03.12 2020-06-25 22:44:19 -07:00
Sergey Lukjanov a4ea8abae6 docker: 19.03.10 -> 19.03.11 2020-06-01 08:44:02 -07:00
Sergey Lukjanov c8dddcb1a9 docker: 19.03.9 -> 19.03.10 2020-05-29 11:08:03 -07:00
Sergey Lukjanov fb3039d91b docker: 19.03.8 -> 19.03.9 2020-05-20 10:52:10 -07:00
zowoq 764dd5c875 docker: use installShellFiles 2020-05-10 11:33:04 +10:00
Milan Pässler 08d83c1641 docker: add git to extraPath
When building a docker container from git, docker was missing the git
binary in $PATH.
2020-04-18 21:48:55 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Sergey Lukjanov 1d0c3f148b docker: 19.03.7 -> 19.03.8 2020-03-11 21:11:10 -07:00
Sergey Lukjanov e1611f85c2 docker: 19.03.6 -> 19.03.7 2020-03-05 07:18:44 -08:00
zowoq 1979e038a3 docker: 19.03.5 -> 19.03.6
https://github.com/docker/docker-ce/releases/tag/v19.03.6
2020-02-13 14:17:47 +10:00
zowoq 31d2d5a382 docker: 19.03.4 -> 19.03.5 2020-01-03 12:49:49 +00:00
Robin Gloster 5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
adisbladis 5dd330ef0e
Merge pull request #72093 from prusnak/go-fortify
stop using hardeningDisable = [ "fortify" ]; for Go packages
2019-10-28 14:09:55 +01:00
Tim Steinbach eada48dd98
docker: 19.03.2 -> 19.03.4 2019-10-27 11:01:34 -04:00
Pavol Rusnak afd38ea1ee
stop using hardeningDisable = [ "fortify" ]; for Go packages
it seems that the issue #25959 is not present anymore
2019-10-27 14:44:26 +01:00
Dima b36ee87814 docker-runc: switch to OCI runc 1.0.0-rc8+dev
The revision picked is based on
https://github.com/docker/docker-ce/blob/19.03/components/engine/hack/dockerfile/install/runc.installer
and https://github.com/docker/docker-ce/blob/18.09/components/engine/hack/dockerfile/install/runc.installer

This should address CVE-2019-16884.
2019-10-19 15:39:09 +02:00
Tim Steinbach 8a18c9f261
docker: 19.03.1 -> 19.03.2 2019-09-09 09:11:41 -04:00
Tim Steinbach 69796183b3
docker: 18.09.8 -> 18.09.9 2019-09-09 08:59:03 -04:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Tim Steinbach 6dfd13ab34
docker: 18.09.8 -> 19.03.1
Keep docker_18_09 around as it is still supported.
2019-07-26 12:43:36 -04:00
Tim Steinbach 86f424585f
docker: 18.09.7 -> 18.09.8 2019-07-26 12:43:36 -04:00
Tim Steinbach 3bdaf58710
docker: 18.09.6 -> 18.09.7 2019-07-03 20:15:32 -04:00
Tim Steinbach d35692126f
docker: 18.09.5 -> 18.09.6 2019-05-22 09:15:36 -04:00
Neil Mayhew 48415a20b9 docker: 18.09.2 -> 18.09.5 2019-04-27 17:48:50 -04:00
Neil Mayhew f100ec7939 docker: make overridable 2019-04-27 17:48:50 -04:00
Wael M. Nasreddine eee09b103c
docker: export GOCACHE for all platforms 2019-03-11 09:59:10 -07:00
Wael M. Nasreddine 6ef04cabd4
go_1_12: init at go 1.12 2019-03-02 14:24:17 -08:00
Sarah Brofeldt 09080380ee docker: 18.09.1 -> 18.09.2 2019-02-12 13:14:31 +00:00
Will Dietz 487a43324e docker: 18.09.0 -> 18.09.1
https://github.com/docker/docker-ce/releases/tag/v18.09.1
2019-01-25 07:37:39 -06:00
Vincent Demeester 17ddcccb56
containerd: migrate to using buildGoPackage
… and add man pages, which means `containerd` becomes a multi-output
derivation : `containerd.bin` and `containerd.man`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-12-20 14:25:24 +01:00