JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
287,246 Commits 2 Branches 0 Tags 13 GiB
1b09f6b7f0
Commit Graph

164 Commits

Author SHA1 Message Date
gfrascadorio
a54bc9b671
docker: fix systemd unit files (#120019) 
* docker: fix systemd unit files

Add missing docker.socket file and patch ExecStart in docker.service
so these units are useful on non-nixos systems using systemd.
(issue #70407)

* moved systemd units under: optionalString (stdenv.isLinux)
 2021-04-26 02:43:09 +02:00
sternenseemann
b126d5436a docker: move makeWrapper to nativeBuildInputs 
This fixes evaluation of docker when cross compiling. Reproducer:

```
nix-repl> (import ./. { crossOverlays = [ (_: _: {}) ]; }).docker
```

Fails on master, resolved with this PR.
 2021-04-12 19:06:02 +02:00
Sandro Jäckel
9378fdf87e
iproute: deprecate alias 2021-04-04 01:43:46 +02:00
Ozan Sener
78f322f2d0 dockerTools: fix build on Darwin 
Fixes #110665

Introduced by #109420
 2021-03-04 16:17:48 +01:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07: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
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +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
Ivan Babrou
e431ff7e2e docker-buildx: init at 0.5.1 
Installing docker-buildx enables buildx subcommand on the client:

* https://github.com/docker/buildx
 2021-01-21 12:52:45 -08:00
Ben Siraphob
108bdac3d9 pkgs/applications: stdenv.lib -> lib 2021-01-15 14:24:03 +07: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
Sandro
e12409de89
Merge pull request #108959 from mikroskeem/docker-proxy-update 
docker-proxy: 7b2b1fe -> fa125a3
 2021-01-13 09:18:19 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib; 
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
 2021-01-11 10:38:22 +01:00
Mark Vainomaa
855bf1a311
docker-proxy: 7b2b1fe -> fa125a3 2021-01-10 17:31:10 +02: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
zowoq
b5dc07a4b4 treewide: use $out instead of $bin with buildGoPackage 2020-04-28 20:30:29 +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
Maximilian Bosch
7d8205bc09
docker-distribution: 2.6.2 -> 2.7.1 2019-12-03 13:49:03 +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