Commit Graph

281 Commits

Author SHA1 Message Date
R. Ryantm
130d56cffd docker-compose: 2.10.1 -> 2.10.2 2022-08-28 09:12:35 +00:00
Sandro Jäckel
c35b1908a2
docker-compose: 2.10.0 -> 2.10.1 2022-08-24 20:10:09 +02:00
Sandro
bc6be68099
Merge pull request #187427 from r-ryantm/auto-update/docker-buildx 2022-08-23 01:30:15 +02:00
Sandro Jäckel
c46e14ba7d
docker-compose: 2.9.0 -> 2.10.0 2022-08-19 19:12:26 +02:00
R. Ryantm
f3b9971e4a docker-buildx: 0.9.0 -> 0.9.1 2022-08-19 10:13:31 +00:00
R. Ryantm
9fa27cd43e docker-buildx: 0.8.2 -> 0.9.0 2022-08-17 06:09:37 +00:00
superherointj
c9cd02582f
Merge pull request #177560 from rgo3/fix-buildx
docker-buildx: pass version to ldflags
2022-08-02 19:04:12 -03:00
R. Ryantm
628c8afb5a docker-compose: 2.8.0 -> 2.9.0 2022-08-02 11:08:41 +00:00
Sandro Jäckel
dd4867bbd7
docker-compose: 2.7.0 -> 2.8.0 2022-07-29 23:26:22 +02:00
Sandro Jäckel
da849f7b30
docker-compose: 2.6.1 -> 2.7.0 2022-07-22 14:37:49 +02:00
Robin Gögge
c673e1ff02 docker-buildx: pass version to ldflags
With this change `docker buildx version` behaves as
expected. Fixes #177540.

Signed-off-by: Robin Gögge <r.goegge@gmail.com>
2022-06-30 15:19:44 +02:00
R. Ryantm
eeb24ae88f docker-distribution: 2.7.1 -> 2.8.1 2022-06-25 16:39:55 +00:00
Sandro Jäckel
736c9800c9
docker-compose: 2.6.0 -> 2.6.1 2022-06-23 20:44:59 +02:00
Maxine Aubrey
c0a672b343
docker: 20.10.16 -> 20.10.17
- https://github.com/moby/moby/releases/tag/v20.10.17
- https://github.com/containerd/containerd/releases/tag/v1.6.6
- https://github.com/docker/cli/releases/tag/v20.10.17
- https://github.com/opencontainers/runc/releases/tag/v1.1.2
2022-06-10 23:38:56 +02:00
zowoq
4ffef83408 docker-compose: add $out/bin symlink 2022-06-06 14:58:18 +10:00
zowoq
b7b91880d3 docker-compose: default to v2 2022-06-06 14:58:18 +10:00
Sandro Jäckel
18d53f807e
docker-compose_2: 2.5.1 -> 2.6.0 2022-05-30 22:42:09 +02:00
Maxine Aubrey
f21fb9441f
docker: 20.10.15 -> 20.10.16
- https://docs.docker.com/engine/release-notes/#201016
- https://github.com/docker/cli/releases/tag/v20.10.16
- https://github.com/moby/moby/releases/tag/v20.10.16
2022-05-25 18:28:01 +02:00
R. Ryantm
dc51978b78 docker-compose_2: 2.5.0 -> 2.5.1 2022-05-25 11:47:23 +00:00
Maxine Aubrey
6401b21ad3
docker: 20.10.14 -> 20.10.15
https://docs.docker.com/engine/release-notes/#201015
https://github.com/moby/moby/releases/tag/v20.10.15
https://github.com/docker/cli/releases/tag/v20.10.15
https://github.com/containerd/containerd/releases/tag/v1.6.4
https://github.com/opencontainers/runc/releases/tag/v1.1.1
2022-05-06 00:49:05 +02:00
Maxine Aubrey
01b99ebcff
docker-compose_2: 2.4.1 -> 2.5.0
https://github.com/docker/compose/releases/tag/v2.5.0
2022-05-06 00:39:57 +02:00
Ryan Mulligan
14dac00935
Merge pull request #167704 from r-ryantm/auto-update/docker-buildx
docker-buildx: 0.8.1 -> 0.8.2
2022-04-07 13:12:54 -07:00
R. Ryantm
d4ba374390 docker-buildx: 0.8.1 -> 0.8.2 2022-04-07 11:59:39 +00:00
R. Ryantm
23d4b86f82 docker-compose_2: 2.4.0 -> 2.4.1 2022-04-07 10:51:45 +00:00
R. Ryantm
edc6a9ecda docker-compose_2: 2.3.4 -> 2.4.0 2022-04-04 09:19:48 +00:00
R. Ryantm
c443e2fc5d docker-compose_2: 2.3.3 -> 2.3.4 2022-03-26 12:18:51 +00:00
davidak
6ea8d5ee71
Merge pull request #165297 from Stunkymonkey/treewide-pname-version-17
treewide: rename name to pname&version
2022-03-24 16:38:33 +01:00
Maxine Aubrey
ae79018c44
docker: 20.10.13 -> 20.10.14
https://docs.docker.com/engine/release-notes/#201014
2022-03-24 10:50:48 +01:00
Felix Buehler
3bc5196252 treewide: rename name to pname&version 2022-03-23 22:55:50 +01:00
R. Ryantm
a6fd2c4618 docker-buildx: 0.8.0 -> 0.8.1 2022-03-22 04:08:19 +00:00
Tomek Mańko
3d25f046b3 docker: add a patch to fix Docker buildkit when using ZFS graph driver.
The patch incorporates changes merged into the upstream in this PR:
https://github.com/moby/moby/pull/43136
2022-03-20 00:26:33 +01:00
Maxine Aubrey
b73b403865
docker: 20.10.12 -> 20.10.13
https://docs.docker.com/engine/release-notes/#201013
2022-03-18 16:27:50 +01:00
Sandro
4e508d5979
Merge pull request #163963 from r-ryantm/auto-update/docker-compose 2022-03-14 01:47:51 +01:00
R. Ryantm
52bc965878 docker-compose_2: 2.3.0 -> 2.3.3 2022-03-13 06:04:27 +00:00
R. Ryantm
c8081af93f docker-buildx: 0.7.1 -> 0.8.0 2022-03-12 06:35:37 +00:00
R. Ryantm
8ec0f86345 docker-compose_2: 2.2.3 -> 2.3.0 2022-03-05 16:42:49 +00:00
Sandro Jäckel
c5ceb2b05c
docker-compose_2: 2.2.2 -> 2.2.3 2022-01-19 14:44:40 +01:00
Sandro Jäckel
259955a975
docker-compose_2: add SuperSandro2000 as maintainer, strip more 2022-01-19 14:43:35 +01:00
zowoq
18f7554a51 docker-compose_2: update vendorSha256 2022-01-11 06:31:22 +10:00
Danielle Lancashire
18d0fe9b69 docker_20_10: 20.10.9 -> 20.10.12 2022-01-06 14:26:57 +00:00
Renaud
93eb018011
Merge pull request #150648 from whentze/master
docker-compose2: pass version to ldflags
2022-01-03 00:07:48 +01:00
Nikolay Amiantov
b4703e11af docker: only add rootless dependencies for the server
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2021-12-22 14:23:23 +03:00
Nikolay Amiantov
721fde93ff docker: add rootless daemon script 2021-12-22 14:18:14 +03:00
whentze
23fc476f99
docker-compose2: pass version to ldflags
The package already has a version in nixpkgs, but reports "dev" when asked via CLI.
With this change, `docker compose version` behaves as expected.
2021-12-14 09:37:47 +01:00
R. Ryantm
5442c772e6 docker-compose_2: 2.0.1 -> 2.2.2 2021-12-11 12:06:53 +00:00
R. Ryantm
73abda994e docker-buildx: 0.6.3 -> 0.7.1 2021-12-06 14:08:58 +00:00
Bastien Rivière
33bc6f8706
docker-compose2: init at 2.0.1 (#141366)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-16 18:19:32 +02:00
Maxine Aubrey
144058e16d
docker: 20.10.8 -> 20.10.9
- https://docs.docker.com/engine/release-notes/#20109
- https://github.com/moby/moby/releases/tag/v20.10.9
- https://github.com/containerd/containerd/releases/tag/v1.4.11
- https://github.com/containerd/containerd/releases/tag/v1.4.10
- https://github.com/opencontainers/runc/releases/tag/v1.0.2
2021-10-04 21:49:38 +02:00
R. RyanTM
db84ea4cfb docker-buildx: 0.6.2 -> 0.6.3 2021-09-06 05:11:06 +00:00
zowoq
69a333ab31 docker-proxy: remove invalid godeps = null 2021-08-27 06:43:33 +10:00
Sandro Jäckel
c2d20d0b59
docker-buildx: fix wrong source hash calculated by r-ryantm 2021-08-26 16:58:39 +02:00
R. RyanTM
6745446b71 docker-buildx: 0.6.1 -> 0.6.2 2021-08-21 21:30:24 +00:00
Maxine Aubrey
078285c645
containerd_1_4: init at 1.4.9 2021-08-11 12:53:10 +02:00
Maxine Aubrey
871730254e
docker: 20.10.7 -> 20.10.8
docker-runc: 1.0.0-rc95 -> 1.0.1
docker-containerd: 1.5.1 -> 1.4.9
2021-08-05 00:38:24 +02:00
R. RyanTM
a2e6029290 docker-buildx: 0.6.0 -> 0.6.1 2021-07-31 11:03:16 +00:00
R. RyanTM
1caa4f9452 docker-buildx: 0.5.1 -> 0.6.0 2021-07-20 01:52:24 +00:00
Mark Vainomaa
e2b28504ab
docker: add @mikroskeem to maintainers 2021-07-12 19:33:03 +03:00
Mark Vainomaa
fc38adafea
docker: narrow patchShebangs 2021-07-12 19:32:15 +03:00
Mark Vainomaa
2c7bdb05de
docker: enable buildx support by default 2021-07-12 19:32:14 +03:00
Mark Vainomaa
1553e742f5
docker: improve readability, drop unneeded substitutes 2021-07-12 19:32:14 +03:00
Mark Vainomaa
ff2c16095d
docker: 20.10.6 -> 20.10.7 2021-07-12 19:32:13 +03:00
Zane van Iperen
9c40b6f375
tini: don't explicitly depend on glibc
* Fixes pkgsStatic.tini build.
* Use postPatch instead of patchPhase
* Moves glibc dependency into docker.docker-tini
2021-06-11 18:03:15 +10:00
Mark Vainomaa
ad256a077b docker: bump runc to 1.0-rc95, fixing CVE-2021-30465 2021-05-28 11:28:02 -07:00
Mark Vainomaa
beab9f0322 docker: use commit hashes instead of tags, fix containerd sha256 2021-05-28 11:28:02 -07:00
Mark Vainomaa
8baf7189b0 docker: drop unused argument, use pname instead of name 2021-05-28 11:28:02 -07:00
Mark Vainomaa
9868aa6050 docker: 20.10.2 -> 20.10.6 2021-05-28 11:28:02 -07:00
zowoq
7233acd515 docker: add clientOnly / docker-client
Currently the docker client is only available on non-linux platforms as `docker`,
this makes the client available on linux and other platforms as `docker-client`.
2021-05-28 08:08:56 +10:00
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